Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/netinet/ip_input.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet/ip_input.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.130.2.13 retrieving revision 1.155 diff -u -p -r1.130.2.13 -r1.155 --- src/sys/netinet/ip_input.c 2002/09/17 21:23:03 1.130.2.13 +++ src/sys/netinet/ip_input.c 2002/08/14 00:23:31 1.155 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_input.c,v 1.130.2.13 2002/09/17 21:23:03 nathanw Exp $ */ +/* $NetBSD: ip_input.c,v 1.155 2002/08/14 00:23:31 itojun Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -102,7 +102,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.130.2.13 2002/09/17 21:23:03 nathanw Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.155 2002/08/14 00:23:31 itojun Exp $"); #include "opt_gateway.h" #include "opt_pfil_hooks.h" @@ -192,7 +192,7 @@ int ip_forwsrcrt = IPFORWSRCRT; int ip_directedbcast = IPDIRECTEDBCAST; int ip_allowsrcrt = IPALLOWSRCRT; int ip_mtudisc = IPMTUDISC; -int ip_mtudisc_timeout = IPMTUDISCTIMEOUT; +u_int ip_mtudisc_timeout = IPMTUDISCTIMEOUT; #ifdef DIAGNOSTIC int ipprintfs = 0; #endif @@ -1865,8 +1865,6 @@ ip_sysctl(name, namelen, oldp, oldlenp, case IPCTL_MTUDISCTIMEOUT: error = sysctl_int(oldp, oldlenp, newp, newlen, &ip_mtudisc_timeout); - if (ip_mtudisc_timeout < 0) - return (EINVAL); if (ip_mtudisc_timeout_q != NULL) rt_timer_queue_change(ip_mtudisc_timeout_q, ip_mtudisc_timeout); @@ -1889,13 +1887,13 @@ ip_sysctl(name, namelen, oldp, oldlenp, &hostzeroisbroadcast)); #if NGIF > 0 case IPCTL_GIF_TTL: - return (sysctl_int(oldp, oldlenp, newp, newlen, + return(sysctl_int(oldp, oldlenp, newp, newlen, &ip_gif_ttl)); #endif #if NGRE > 0 case IPCTL_GRE_TTL: - return (sysctl_int(oldp, oldlenp, newp, newlen, + return(sysctl_int(oldp, oldlenp, newp, newlen, &ip_gre_ttl)); #endif