summaryrefslogtreecommitdiff
path: root/net/ipv4
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-07-16 18:06:24 -0700
committerDavid S. Miller <davem@davemloft.net>2011-07-16 18:30:59 -0700
commit542d4d685febf3110d1a08d0bcb9f6ef060b76f7 (patch)
tree8bfb9b8c8f7e8d359030781367634269f843d3e3 /net/ipv4
parentb23b5455b6458920179a1f27513ce42e70d11f37 (diff)
downloadlinux-3.10-542d4d685febf3110d1a08d0bcb9f6ef060b76f7.tar.gz
linux-3.10-542d4d685febf3110d1a08d0bcb9f6ef060b76f7.tar.bz2
linux-3.10-542d4d685febf3110d1a08d0bcb9f6ef060b76f7.zip
neigh: Kill ndisc_ops->queue_xmit
It is always dev_queue_xmit(). Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/arp.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index f5f0aa1cd3a..8a21403cdd3 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -138,7 +138,6 @@ static const struct neigh_ops arp_generic_ops = {
.error_report = arp_error_report,
.output = neigh_resolve_output,
.connected_output = neigh_connected_output,
- .queue_xmit = dev_queue_xmit,
};
static const struct neigh_ops arp_hh_ops = {
@@ -147,14 +146,12 @@ static const struct neigh_ops arp_hh_ops = {
.error_report = arp_error_report,
.output = neigh_resolve_output,
.connected_output = neigh_resolve_output,
- .queue_xmit = dev_queue_xmit,
};
static const struct neigh_ops arp_direct_ops = {
.family = AF_INET,
.output = dev_queue_xmit,
.connected_output = dev_queue_xmit,
- .queue_xmit = dev_queue_xmit,
};
static const struct neigh_ops arp_broken_ops = {
@@ -163,7 +160,6 @@ static const struct neigh_ops arp_broken_ops = {
.error_report = arp_error_report,
.output = neigh_compat_output,
.connected_output = neigh_compat_output,
- .queue_xmit = dev_queue_xmit,
};
struct neigh_table arp_tbl = {
@@ -254,7 +250,7 @@ static int arp_constructor(struct neighbour *neigh)
if (!dev->header_ops) {
neigh->nud_state = NUD_NOARP;
neigh->ops = &arp_direct_ops;
- neigh->output = neigh->ops->queue_xmit;
+ neigh->output = dev_queue_xmit;
} else {
/* Good devices (checked by reading texts, but only Ethernet is
tested)