diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2015-09-15 20:03:53 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-17 17:18:32 -0700 |
| commit | 5a70649e0dae02ba5090540fffce667d2300bc5a (patch) | |
| tree | 38e18ea126c7665eebaf3ff3231a43522929a115 /net/ipv6/ip6_vti.c | |
| parent | a6568b2425daffc7b21ae63b6601b57ae14b5cb8 (diff) | |
| download | linux-5a70649e0dae02ba5090540fffce667d2300bc5a.tar.gz linux-5a70649e0dae02ba5090540fffce667d2300bc5a.tar.bz2 linux-5a70649e0dae02ba5090540fffce667d2300bc5a.zip | |
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>
Diffstat (limited to 'net/ipv6/ip6_vti.c')
| -rw-r--r-- | net/ipv6/ip6_vti.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c index 0224c032dca5..f96f1c19b4a8 100644 --- a/net/ipv6/ip6_vti.c +++ b/net/ipv6/ip6_vti.c @@ -482,7 +482,7 @@ vti6_xmit(struct sk_buff *skb, struct net_device *dev, struct flowi *fl) return -EMSGSIZE; } - err = dst_output(skb); + err = dst_output(skb->sk, skb); if (net_xmit_eval(err) == 0) { struct pcpu_sw_netstats *tstats = this_cpu_ptr(dev->tstats); |