diff options
| author | Eric W. Biederman | 2015-09-16 03:03:53 +0200 |
|---|---|---|
| committer | David S. Miller | 2015-09-18 02:18:32 +0200 |
| commit | 5a70649e0dae02ba5090540fffce667d2300bc5a (patch) | |
| tree | 38e18ea126c7665eebaf3ff3231a43522929a115 /net/ipv6/ndisc.c | |
| parent | xfrm: Remove unused afinfo method init_dst (diff) | |
| download | kernel-qcow2-linux-5a70649e0dae02ba5090540fffce667d2300bc5a.tar.gz kernel-qcow2-linux-5a70649e0dae02ba5090540fffce667d2300bc5a.tar.xz kernel-qcow2-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/ndisc.c')
| -rw-r--r-- | net/ipv6/ndisc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 64a71354b069..349ac1b022b6 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c @@ -465,7 +465,7 @@ static void ndisc_send_skb(struct sk_buff *skb, err = NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, sk, skb, NULL, dst->dev, - dst_output_sk); + dst_output); if (!err) { ICMP6MSGOUT_INC_STATS(net, idev, type); ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTMSGS); |