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

net: Merge dst_output and dst_output_sk

Browse Source 
Add a sock paramter to dst_output making dst_output_sk superfluous.
Add a skb->sk parameter to all of the callers of dst_output
Have the callers of dst_output_sk call dst_output.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric W. Biederman
2015-09-15 20:03:53 -05:00
committed by David S. Miller
parent a6568b2425
commit 5a70649e0d
19 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv6/xfrm6_output.c
View File

@@ -140,7 +140,7 @@ static int __xfrm6_output(struct sock *sk, struct sk_buff *skb)
#ifdef CONFIG_NETFILTER
if (!x) {
IP6CB(skb)->flags |= IP6SKB_REROUTED;
return dst_output_sk(sk, skb);
return dst_output(sk, skb);
}
#endif