diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2015-10-07 16:48:47 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-08 04:27:03 -0700 |
| commit | ede2059dbaf9c6557a49d466c8c7778343b208ff (patch) | |
| tree | d6d15cbeb675b52ef22890a2228b5301b1396c45 /net/ipv4/xfrm4_output.c | |
| parent | 33224b16ffccb49cf798317670389e0bfba0024c (diff) | |
| download | linux-ede2059dbaf9c6557a49d466c8c7778343b208ff.tar.gz linux-ede2059dbaf9c6557a49d466c8c7778343b208ff.tar.bz2 linux-ede2059dbaf9c6557a49d466c8c7778343b208ff.zip | |
dst: Pass net into dst->output
The network namespace is already passed into dst_output pass it into
dst->output lwt->output and friends.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/xfrm4_output.c')
| -rw-r--r-- | net/ipv4/xfrm4_output.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv4/xfrm4_output.c b/net/ipv4/xfrm4_output.c index 17db61f4b439..9f298d0dc9a1 100644 --- a/net/ipv4/xfrm4_output.c +++ b/net/ipv4/xfrm4_output.c @@ -94,10 +94,8 @@ static int __xfrm4_output(struct net *net, struct sock *sk, struct sk_buff *skb) return x->outer_mode->afinfo->output_finish(sk, skb); } -int xfrm4_output(struct sock *sk, struct sk_buff *skb) +int xfrm4_output(struct net *net, struct sock *sk, struct sk_buff *skb) { - struct net *net = dev_net(skb_dst(skb)->dev); - return NF_HOOK_COND(NFPROTO_IPV4, NF_INET_POST_ROUTING, net, sk, skb, NULL, skb_dst(skb)->dev, __xfrm4_output, |