| Message ID | 1389663588-29678-2-git-send-email-fan.du@windriver.com |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
2014-01-14, 09:39:44 +0800, Fan Du wrote: > Since flowcache is tightly coupled with IPsec, so it would be > easier to put flow cache global parameters here into xfrm > namespace part. > > Signed-off-by: Fan Du <fan.du@windriver.com> > --- > include/net/netns/xfrm.h | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h > index 1006a26..52d0086 100644 > --- a/include/net/netns/xfrm.h > +++ b/include/net/netns/xfrm.h > @@ -6,6 +6,7 @@ > #include <linux/workqueue.h> > #include <linux/xfrm.h> > #include <net/dst_ops.h> > +#include <net/flowcache.h> You are including a file that doesn't exist yet. You create it later, with patch 2. This breaks bisection.
diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h index 1006a26..52d0086 100644 --- a/include/net/netns/xfrm.h +++ b/include/net/netns/xfrm.h @@ -6,6 +6,7 @@ #include <linux/workqueue.h> #include <linux/xfrm.h> #include <net/dst_ops.h> +#include <net/flowcache.h> struct ctl_table_header; @@ -61,6 +62,16 @@ struct netns_xfrm { spinlock_t xfrm_policy_sk_bundle_lock; rwlock_t xfrm_policy_lock; struct mutex xfrm_cfg_mutex; + + /* flow cache part */ + struct flow_cache flow_cache_global; + struct kmem_cache *flow_cachep; + atomic_t flow_cache_genid; + struct list_head flow_cache_gc_list; + spinlock_t flow_cache_gc_lock; + struct work_struct flow_cache_gc_work; + struct work_struct flow_cache_flush_work; + struct mutex flow_flush_sem; }; #endif
Since flowcache is tightly coupled with IPsec, so it would be easier to put flow cache global parameters here into xfrm namespace part. Signed-off-by: Fan Du <fan.du@windriver.com> --- include/net/netns/xfrm.h | 11 +++++++++++ 1 file changed, 11 insertions(+)