diff options
author | David S. Miller <davem@davemloft.net> | 2011-07-16 18:06:24 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-07-16 18:30:59 -0700 |
commit | 542d4d685febf3110d1a08d0bcb9f6ef060b76f7 (patch) | |
tree | 8bfb9b8c8f7e8d359030781367634269f843d3e3 | |
parent | b23b5455b6458920179a1f27513ce42e70d11f37 (diff) |
neigh: Kill ndisc_ops->queue_xmit
It is always dev_queue_xmit().
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/net/neighbour.h | 1 | ||||
-rw-r--r-- | net/atm/clip.c | 1 | ||||
-rw-r--r-- | net/core/neighbour.c | 4 | ||||
-rw-r--r-- | net/decnet/dn_neigh.c | 5 | ||||
-rw-r--r-- | net/ipv4/arp.c | 6 | ||||
-rw-r--r-- | net/ipv6/ndisc.c | 5 |
6 files changed, 5 insertions, 17 deletions
diff --git a/include/net/neighbour.h b/include/net/neighbour.h index 60bac8112d8..334e92f95bb 100644 --- a/include/net/neighbour.h +++ b/include/net/neighbour.h @@ -122,7 +122,6 @@ struct neigh_ops { void (*error_report)(struct neighbour *, struct sk_buff*); int (*output)(struct sk_buff*); int (*connected_output)(struct sk_buff*); - int (*queue_xmit)(struct sk_buff*); }; struct pneigh_entry { diff --git a/net/atm/clip.c b/net/atm/clip.c index 036cd43c13a..40d73689967 100644 --- a/net/atm/clip.c +++ b/net/atm/clip.c @@ -273,7 +273,6 @@ static const struct neigh_ops clip_neigh_ops = { .error_report = clip_neigh_error, .output = dev_queue_xmit, .connected_output = dev_queue_xmit, - .queue_xmit = dev_queue_xmit, }; static int clip_constructor(struct neighbour *neigh) diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 2feda6e7a31..b031cf63d6a 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -1257,7 +1257,7 @@ int neigh_resolve_output(struct sk_buff *skb) } while (read_seqretry(&neigh->ha_lock, seq)); if (err >= 0) - rc = neigh->ops->queue_xmit(skb); + rc = dev_queue_xmit(skb); else goto out_kfree_skb; } @@ -1292,7 +1292,7 @@ int neigh_connected_output(struct sk_buff *skb) } while (read_seqretry(&neigh->ha_lock, seq)); if (err >= 0) - err = neigh->ops->queue_xmit(skb); + err = dev_queue_xmit(skb); else { err = -EINVAL; kfree_skb(skb); diff --git a/net/decnet/dn_neigh.c b/net/decnet/dn_neigh.c index abf4de851c6..84fee8a4f89 100644 --- a/net/decnet/dn_neigh.c +++ b/net/decnet/dn_neigh.c @@ -64,7 +64,6 @@ static const struct neigh_ops dn_long_ops = { .error_report = dn_long_error_report, .output = dn_long_output, .connected_output = dn_long_output, - .queue_xmit = dev_queue_xmit, }; /* @@ -75,7 +74,6 @@ static const struct neigh_ops dn_short_ops = { .error_report = dn_short_error_report, .output = dn_short_output, .connected_output = dn_short_output, - .queue_xmit = dev_queue_xmit, }; /* @@ -86,7 +84,6 @@ static const struct neigh_ops dn_phase3_ops = { .error_report = dn_short_error_report, /* Can use short version here */ .output = dn_phase3_output, .connected_output = dn_phase3_output, - .queue_xmit = dev_queue_xmit }; static u32 dn_neigh_hash(const void *pkey, @@ -212,7 +209,7 @@ static int dn_neigh_output_packet(struct sk_buff *skb) dn_dn2eth(mac_addr, rt->rt_local_src); if (dev_hard_header(skb, dev, ntohs(skb->protocol), neigh->ha, mac_addr, skb->len) >= 0) - return neigh->ops->queue_xmit(skb); + return dev_queue_xmit(skb); if (net_ratelimit()) printk(KERN_DEBUG "dn_neigh_output_packet: oops, can't send packet\n"); 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) diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index db782d2f7cc..482b970b835 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c @@ -107,7 +107,6 @@ static const struct neigh_ops ndisc_generic_ops = { .error_report = ndisc_error_report, .output = neigh_resolve_output, .connected_output = neigh_connected_output, - .queue_xmit = dev_queue_xmit, }; static const struct neigh_ops ndisc_hh_ops = { @@ -116,7 +115,6 @@ static const struct neigh_ops ndisc_hh_ops = { .error_report = ndisc_error_report, .output = neigh_resolve_output, .connected_output = neigh_resolve_output, - .queue_xmit = dev_queue_xmit, }; @@ -124,7 +122,6 @@ static const struct neigh_ops ndisc_direct_ops = { .family = AF_INET6, .output = dev_queue_xmit, .connected_output = dev_queue_xmit, - .queue_xmit = dev_queue_xmit, }; struct neigh_table nd_tbl = { @@ -389,7 +386,7 @@ static int ndisc_constructor(struct neighbour *neigh) if (!dev->header_ops) { neigh->nud_state = NUD_NOARP; neigh->ops = &ndisc_direct_ops; - neigh->output = neigh->ops->queue_xmit; + neigh->output = dev_queue_xmit; } else { if (is_multicast) { neigh->nud_state = NUD_NOARP; |