leandrof/linux
1
0
Fork 0
Code Issues Pull Requests 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/xfrm/xfrm_output.c
View File

@@ -139,7 +139,7 @@ int xfrm_output_resume(struct sk_buff *skb, int err)
goto out;
if (!skb_dst(skb)->xfrm)
return dst_output(skb);
return dst_output(skb->sk, skb);
err = nf_hook(skb_dst(skb)->ops->family,
NF_INET_POST_ROUTING, skb->sk, skb,