diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-11-25 20:36:13 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-25 20:36:13 -0500 |
commit | 99a66657b2f62ae8b2b1e6ffc6abed051e4561ca (patch) | |
tree | ce3d720da709565e427ad805ba8b50a4bbb2b5d3 /include/net/xfrm.h | |
parent | f6e1e25d703c0a9ba1863384a16851dec52f8e3a (diff) |
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/xfrm.h')
-rw-r--r-- | include/net/xfrm.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 158848f55640..36c8cffdf4e2 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); | |||
1050 | 1050 | ||
1051 | static inline int xfrm_route_forward(struct sk_buff *skb, unsigned short family) | 1051 | static inline int xfrm_route_forward(struct sk_buff *skb, unsigned short family) |
1052 | { | 1052 | { |
1053 | return !init_net.xfrm.policy_count[XFRM_POLICY_OUT] || | 1053 | struct net *net = dev_net(skb->dev); |
1054 | |||
1055 | return !net->xfrm.policy_count[XFRM_POLICY_OUT] || | ||
1054 | (skb->dst->flags & DST_NOXFRM) || | 1056 | (skb->dst->flags & DST_NOXFRM) || |
1055 | __xfrm_route_forward(skb, family); | 1057 | __xfrm_route_forward(skb, family); |
1056 | } | 1058 | } |