diff options
| author | Kip Macy <kmacy@FreeBSD.org> | 2009-06-09 21:55:28 +0000 |
|---|---|---|
| committer | Kip Macy <kmacy@FreeBSD.org> | 2009-06-09 21:55:28 +0000 |
| commit | 3576e2f4a24d1dcd74f1672eccd4d49a4b72e1ba (patch) | |
| tree | 2be7fc195bb5593f8677e134a5f5dac1dd80c563 | |
| parent | 06f80313e25aed235d91d9ab890f141f0c6d09e5 (diff) | |
Notes
| -rw-r--r-- | sys/conf/files | 2 | ||||
| -rw-r--r-- | sys/conf/options | 2 | ||||
| -rw-r--r-- | sys/net/flowtable.c | 5 | ||||
| -rw-r--r-- | sys/net/flowtable.h | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/sys/conf/files b/sys/conf/files index 59fc31174fae..158d2621a721 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -2180,7 +2180,7 @@ net/bpf_jitter.c optional bpf_jitter net/bpf_filter.c optional bpf | netgraph_bpf net/bpf_zerocopy.c optional bpf net/bridgestp.c optional bridge | if_bridge -net/flowtable.c optional inet +net/flowtable.c optional flowtable inet net/ieee8023ad_lacp.c optional lagg net/if.c standard net/if_arcsubr.c optional arcnet diff --git a/sys/conf/options b/sys/conf/options index ea46f61810cd..5939832650ec 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -421,7 +421,7 @@ TCP_OFFLOAD_DISABLE opt_inet.h #Disable code to dispatch tcp offloading TCP_SIGNATURE opt_inet.h VLAN_ARRAY opt_vlan.h XBONEHACK -NO_FLOWTABLE opt_route.h +FLOWTABLE opt_route.h # # SCTP diff --git a/sys/net/flowtable.c b/sys/net/flowtable.c index 14c07ca3f87d..6edc6abc5cdb 100644 --- a/sys/net/flowtable.c +++ b/sys/net/flowtable.c @@ -33,7 +33,6 @@ POSSIBILITY OF SUCH DAMAGE. #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#ifndef NO_FLOWTABLE #include <sys/param.h> #include <sys/types.h> #include <sys/bitstring.h> @@ -188,7 +187,7 @@ static uma_zone_t ipv6_zone; * - support explicit connection state (currently only ad-hoc for DSR) */ SYSCTL_NODE(_net_inet, OID_AUTO, flowtable, CTLFLAG_RD, NULL, "flowtable"); -int flowtable_enable = 0; +int flowtable_enable = 1; SYSCTL_INT(_net_inet_flowtable, OID_AUTO, enable, CTLFLAG_RW, &flowtable_enable, 0, "enable flowtable caching."); static int flowtable_hits = 0; @@ -930,4 +929,4 @@ static struct kproc_desc flow_kp = { &flowcleanerproc }; SYSINIT(flowcleaner, SI_SUB_KTHREAD_IDLE, SI_ORDER_ANY, kproc_start, &flow_kp); -#endif /* NO_FLOWTABLE */ + diff --git a/sys/net/flowtable.h b/sys/net/flowtable.h index c949293f2b01..bc62a04c3f73 100644 --- a/sys/net/flowtable.h +++ b/sys/net/flowtable.h @@ -41,7 +41,7 @@ struct flowtable; extern struct flowtable *ip_ft; extern struct flowtable *ip_forward_ft; -#ifndef NO_FLOWTABLE +#ifdef FLOWTABLE struct flowtable *flowtable_alloc(int nentry, int flags); /* |