]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commit - net/ipv4/ip_output.c
net: Merge dst_output and dst_output_sk
authorEric W. Biederman <ebiederm@xmission.com>
Wed, 16 Sep 2015 01:03:53 +0000 (20:03 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 18 Sep 2015 00:18:32 +0000 (17:18 -0700)
commit5a70649e0dae02ba5090540fffce667d2300bc5a
tree38e18ea126c7665eebaf3ff3231a43522929a115
parenta6568b2425daffc7b21ae63b6601b57ae14b5cb8
net: Merge dst_output and dst_output_sk

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>
19 files changed:
include/net/dst.h
net/decnet/dn_nsp_out.c
net/ipv4/ip_forward.c
net/ipv4/ip_output.c
net/ipv4/ip_vti.c
net/ipv4/ipmr.c
net/ipv4/raw.c
net/ipv4/xfrm4_output.c
net/ipv6/ip6_output.c
net/ipv6/ip6_vti.c
net/ipv6/ip6mr.c
net/ipv6/mcast.c
net/ipv6/ndisc.c
net/ipv6/output_core.c
net/ipv6/raw.c
net/ipv6/xfrm6_output.c
net/netfilter/ipvs/ip_vs_xmit.c
net/xfrm/xfrm_output.c
net/xfrm/xfrm_policy.c