xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipv6: Pass struct net through ip6_fragment

Browse Source 
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
This commit is contained in:
Eric W. Biederman
2015-06-12 22:12:04 -05:00
parent 694869b3c5
commit 7d8c6e3915
6 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
net/ipv6/xfrm6_output.c
View File

@@ -131,6 +131,12 @@ int xfrm6_output_finish(struct sock *sk, struct sk_buff *skb)
return xfrm_output(sk, skb);
}
static int __xfrm6_output_finish(struct net *net, struct sock *sk, struct sk_buff *skb)
{
struct xfrm_state *x = skb_dst(skb)->xfrm;
return x->outer_mode->afinfo->output_finish(sk, skb);
}
static int __xfrm6_output(struct net *net, struct sock *sk, struct sk_buff *skb)
{
struct dst_entry *dst = skb_dst(skb);
@@ -160,8 +166,8 @@ static int __xfrm6_output(struct net *net, struct sock *sk, struct sk_buff *skb)
if (x->props.mode == XFRM_MODE_TUNNEL &&
((skb->len > mtu && !skb_is_gso(skb)) ||
dst_allfrag(skb_dst(skb)))) {
return ip6_fragment(sk, skb,
x->outer_mode->afinfo->output_finish);
return ip6_fragment(net, sk, skb,
__xfrm6_output_finish);
}
return x->outer_mode->afinfo->output_finish(sk, skb);
}