aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2008-11-25 17:36:13 -0800
committerDavid S. Miller <davem@davemloft.net>2008-11-25 17:36:13 -0800
commit99a66657b2f62ae8b2b1e6ffc6abed051e4561ca (patch)
treece3d720da709565e427ad805ba8b50a4bbb2b5d3 /include/net
parentf6e1e25d703c0a9ba1863384a16851dec52f8e3a (diff)
downloadkernel_samsung_smdk4412-99a66657b2f62ae8b2b1e6ffc6abed051e4561ca.zip
kernel_samsung_smdk4412-99a66657b2f62ae8b2b1e6ffc6abed051e4561ca.tar.gz
kernel_samsung_smdk4412-99a66657b2f62ae8b2b1e6ffc6abed051e4561ca.tar.bz2
netns xfrm: xfrm_route_forward() in netns
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/xfrm.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 158848f..36c8cff 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -1050,7 +1050,9 @@ extern int __xfrm_route_forward(struct sk_buff *skb, unsigned short family);
static inline int xfrm_route_forward(struct sk_buff *skb, unsigned short family)
{
- return !init_net.xfrm.policy_count[XFRM_POLICY_OUT] ||
+ struct net *net = dev_net(skb->dev);
+
+ return !net->xfrm.policy_count[XFRM_POLICY_OUT] ||
(skb->dst->flags & DST_NOXFRM) ||
__xfrm_route_forward(skb, family);
}