summaryrefslogtreecommitdiff
path: root/net/ipv4/arp.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2015-09-15 20:04:05 -0500
committerDavid S. Miller <davem@davemloft.net>2015-09-17 17:18:35 -0700
commitf9e4306fd87c6ff08c9a94212d84a23c16395843 (patch)
treef39a68bfa5f22dee13b35217b333772c43e61b6e /net/ipv4/arp.c
parent244ba779855c2ccbb843444c2dce952ca8c1a78e (diff)
arp: Introduce arp_xmit_finish
The function dev_queue_xmit_skb_sk is unncessary and very confusing. Introduce arp_xmit_finish to remove the need for dev_queue_xmit_skb_sk, and have arp_xmit_finish call dev_queue_xmit. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/arp.c')
-rw-r--r--net/ipv4/arp.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 30409b75e925..3632e98eb0f9 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -621,6 +621,11 @@ out:
}
EXPORT_SYMBOL(arp_create);
+static int arp_xmit_finish(struct sock *sk, struct sk_buff *skb)
+{
+ return dev_queue_xmit(skb);
+}
+
/*
* Send an arp packet.
*/
@@ -628,7 +633,7 @@ void arp_xmit(struct sk_buff *skb)
{
/* Send it off, maybe filter it using firewalling first. */
NF_HOOK(NFPROTO_ARP, NF_ARP_OUT, NULL, skb,
- NULL, skb->dev, dev_queue_xmit_sk);
+ NULL, skb->dev, arp_xmit_finish);
}
EXPORT_SYMBOL(arp_xmit);