diff options
-rw-r--r-- | sys/netinet/in_rmx.c | 7 | ||||
-rw-r--r-- | sys/netinet/in_var.h | 3 | ||||
-rw-r--r-- | sys/netinet/ip_input.c | 5 |
3 files changed, 7 insertions, 8 deletions
diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c index 4e9dd2b..0d66d3c 100644 --- a/sys/netinet/in_rmx.c +++ b/sys/netinet/in_rmx.c @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: in_rmx.c,v 1.20 1995/12/02 19:37:56 bde Exp $ + * $Id: in_rmx.c,v 1.21 1995/12/05 17:45:45 wollman Exp $ */ /* @@ -70,7 +70,6 @@ #endif extern int in_inithead __P((void **head, int off)); -extern void in_rtqdrain __P((void)); #define RTPRF_OURS RTF_PROTO3 /* set on routes we manage */ @@ -304,8 +303,7 @@ in_rtqtimo(void *rock) timeout(in_rtqtimo, rock, hzto(&atv)); } -#ifdef never_used -static void +void in_rtqdrain(void) { struct radix_node_head *rnh = rt_tables[AF_INET]; @@ -320,7 +318,6 @@ in_rtqdrain(void) rnh->rnh_walktree(rnh, in_rtqkill, &arg); splx(s); } -#endif /* * Initialize our routing tree. diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h index 9b3017a..ca8ff4b 100644 --- a/sys/netinet/in_var.h +++ b/sys/netinet/in_var.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)in_var.h 8.2 (Berkeley) 1/9/95 - * $Id: in_var.h,v 1.11 1995/09/21 17:50:45 wollman Exp $ + * $Id: in_var.h,v 1.12 1995/11/14 20:34:07 phk Exp $ */ #ifndef _NETINET_IN_VAR_H_ @@ -220,6 +220,7 @@ struct in_multistep { struct in_multi *in_addmulti __P((struct in_addr *, struct ifnet *)); void in_delmulti __P((struct in_multi *)); int in_control __P((struct socket *, u_long, caddr_t, struct ifnet *)); +void in_rtqdrain __P((void)); #endif /* KERNEL */ diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index a817ac8..8eb91a9 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_input.c 8.2 (Berkeley) 1/4/94 - * $Id: ip_input.c,v 1.29 1995/12/06 23:37:34 bde Exp $ + * $Id: ip_input.c,v 1.30 1995/12/14 09:53:41 phk Exp $ */ #include <sys/param.h> @@ -692,11 +692,12 @@ ip_slowtimo() void ip_drain() { - while (ipq.next != &ipq) { ipstat.ips_fragdropped++; ip_freef(ipq.next); } + + in_rtqdrain(); } /* |