diff options
| author | bz <bz@FreeBSD.org> | 2011-04-20 08:00:29 +0000 |
|---|---|---|
| committer | bz <bz@FreeBSD.org> | 2011-04-20 08:00:29 +0000 |
| commit | 25cccaf492f9174346c2e76cb28eefd79c356c61 (patch) | |
| tree | d91c3220e574e361498bf3a8393460f3bcb463f0 /sys/netinet/ip_input.c | |
| parent | d10762bec798133f31617d3978e0e684a7beaa8d (diff) | |
| download | FreeBSD-src-25cccaf492f9174346c2e76cb28eefd79c356c61.zip FreeBSD-src-25cccaf492f9174346c2e76cb28eefd79c356c61.tar.gz | |
MFp4 CH=191470:
Move the ipport_tick_callout and related functions from ip_input.c
to in_pcb.c. The random source port allocation code has been merged
and is now local to in_pcb.c only.
Use a SYSINIT to get the callout started and no longer depend on
initialization from the inet code, which would not work in an IPv6
only setup.
Reviewed by: gnn
Sponsored by: The FreeBSD Foundation
Sponsored by: iXsystems
MFC after: 4 days
Diffstat (limited to 'sys/netinet/ip_input.c')
| -rw-r--r-- | sys/netinet/ip_input.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index daeda8d..e32b50d 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> -#include <sys/callout.h> #include <sys/mbuf.h> #include <sys/malloc.h> #include <sys/domain.h> @@ -194,8 +193,6 @@ SYSCTL_VNET_INT(_net_inet_ip, OID_AUTO, maxfragsperpacket, CTLFLAG_RW, &VNET_NAME(maxfragsperpacket), 0, "Maximum number of IPv4 fragments allowed per packet"); -struct callout ipport_tick_callout; - #ifdef IPCTL_DEFMTU SYSCTL_INT(_net_inet_ip, IPCTL_DEFMTU, mtu, CTLFLAG_RW, &ip_mtu, 0, "Default MTU"); @@ -352,11 +349,6 @@ ip_init(void) ip_protox[pr->pr_protocol] = pr - inetsw; } - /* Start ipport_tick. */ - callout_init(&ipport_tick_callout, CALLOUT_MPSAFE); - callout_reset(&ipport_tick_callout, 1, ipport_tick, NULL); - EVENTHANDLER_REGISTER(shutdown_pre_sync, ip_fini, NULL, - SHUTDOWN_PRI_DEFAULT); EVENTHANDLER_REGISTER(nmbclusters_change, ipq_zone_change, NULL, EVENTHANDLER_PRI_ANY); @@ -381,13 +373,6 @@ ip_destroy(void) } #endif -void -ip_fini(void *xtp) -{ - - callout_stop(&ipport_tick_callout); -} - /* * Ip input routine. Checksum and byte swap header. If fragmented * try to reassemble. Process options. Pass to next level. |
