diff options
| author | kmacy <kmacy@FreeBSD.org> | 2009-08-17 19:09:28 +0000 |
|---|---|---|
| committer | kmacy <kmacy@FreeBSD.org> | 2009-08-17 19:09:28 +0000 |
| commit | 2836450c4cf3814d40f64a01fe4e0eadcc0d56f9 (patch) | |
| tree | 1599239c73807121f00c25c4c2e91e13d8715f22 | |
| parent | 22b825888b3402b053e766d6f99b4658ef664182 (diff) | |
| download | FreeBSD-src-2836450c4cf3814d40f64a01fe4e0eadcc0d56f9.zip FreeBSD-src-2836450c4cf3814d40f64a01fe4e0eadcc0d56f9.tar.gz | |
fix netboot issue by disabling flowtable lookups until initialization has been run
Reviewed by: rwatson@
Approved by: re@
| -rw-r--r-- | sys/net/flowtable.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/net/flowtable.c b/sys/net/flowtable.c index 4078ae9..efdde72a 100644 --- a/sys/net/flowtable.c +++ b/sys/net/flowtable.c @@ -203,6 +203,7 @@ static VNET_DEFINE(int, flowtable_udp_expire) = UDP_IDLE; static VNET_DEFINE(int, flowtable_fin_wait_expire) = FIN_WAIT_IDLE; static VNET_DEFINE(int, flowtable_tcp_expire) = TCP_IDLE; static VNET_DEFINE(int, flowtable_nmbflows) = 4096; +static VNET_DEFINE(int, flowtable_ready) = 0; #define V_flowtable_enable VNET(flowtable_enable) #define V_flowtable_hits VNET(flowtable_hits) @@ -217,6 +218,7 @@ static VNET_DEFINE(int, flowtable_nmbflows) = 4096; #define V_flowtable_fin_wait_expire VNET(flowtable_fin_wait_expire) #define V_flowtable_tcp_expire VNET(flowtable_tcp_expire) #define V_flowtable_nmbflows VNET(flowtable_nmbflows) +#define V_flowtable_ready VNET(flowtable_ready) SYSCTL_NODE(_net_inet, OID_AUTO, flowtable, CTLFLAG_RD, NULL, "flowtable"); SYSCTL_VNET_INT(_net_inet_flowtable, OID_AUTO, enable, CTLFLAG_RW, @@ -345,7 +347,7 @@ ipv4_flow_lookup_hash_internal(struct mbuf *m, struct route *ro, struct udphdr *uh; struct sctphdr *sh; - if (V_flowtable_enable == 0) + if ((V_flowtable_enable == 0) || (V_flowtable_ready == 0)) return (0); key[1] = key[0] = 0; @@ -799,6 +801,7 @@ flowtable_init(const void *unused __unused) NULL, NULL, NULL, NULL, 64, UMA_ZONE_MAXBUCKET); uma_zone_set_max(V_flow_ipv4_zone, V_flowtable_nmbflows); uma_zone_set_max(V_flow_ipv6_zone, V_flowtable_nmbflows); + V_flowtable_ready = 1; } VNET_SYSINIT(flowtable_init, SI_SUB_KTHREAD_INIT, SI_ORDER_ANY, |
