diff options
author | David S. Miller <davem@davemloft.net> | 2011-07-16 21:06:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-07-16 21:30:59 -0400 |
commit | 542d4d685febf3110d1a08d0bcb9f6ef060b76f7 (patch) | |
tree | 8bfb9b8c8f7e8d359030781367634269f843d3e3 /net/decnet | |
parent | b23b5455b6458920179a1f27513ce42e70d11f37 (diff) |
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/decnet')
-rw-r--r-- | net/decnet/dn_neigh.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/decnet/dn_neigh.c b/net/decnet/dn_neigh.c index abf4de851c63..84fee8a4f89d 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 = { | |||
64 | .error_report = dn_long_error_report, | 64 | .error_report = dn_long_error_report, |
65 | .output = dn_long_output, | 65 | .output = dn_long_output, |
66 | .connected_output = dn_long_output, | 66 | .connected_output = dn_long_output, |
67 | .queue_xmit = dev_queue_xmit, | ||
68 | }; | 67 | }; |
69 | 68 | ||
70 | /* | 69 | /* |
@@ -75,7 +74,6 @@ static const struct neigh_ops dn_short_ops = { | |||
75 | .error_report = dn_short_error_report, | 74 | .error_report = dn_short_error_report, |
76 | .output = dn_short_output, | 75 | .output = dn_short_output, |
77 | .connected_output = dn_short_output, | 76 | .connected_output = dn_short_output, |
78 | .queue_xmit = dev_queue_xmit, | ||
79 | }; | 77 | }; |
80 | 78 | ||
81 | /* | 79 | /* |
@@ -86,7 +84,6 @@ static const struct neigh_ops dn_phase3_ops = { | |||
86 | .error_report = dn_short_error_report, /* Can use short version here */ | 84 | .error_report = dn_short_error_report, /* Can use short version here */ |
87 | .output = dn_phase3_output, | 85 | .output = dn_phase3_output, |
88 | .connected_output = dn_phase3_output, | 86 | .connected_output = dn_phase3_output, |
89 | .queue_xmit = dev_queue_xmit | ||
90 | }; | 87 | }; |
91 | 88 | ||
92 | static u32 dn_neigh_hash(const void *pkey, | 89 | static u32 dn_neigh_hash(const void *pkey, |
@@ -212,7 +209,7 @@ static int dn_neigh_output_packet(struct sk_buff *skb) | |||
212 | dn_dn2eth(mac_addr, rt->rt_local_src); | 209 | dn_dn2eth(mac_addr, rt->rt_local_src); |
213 | if (dev_hard_header(skb, dev, ntohs(skb->protocol), neigh->ha, | 210 | if (dev_hard_header(skb, dev, ntohs(skb->protocol), neigh->ha, |
214 | mac_addr, skb->len) >= 0) | 211 | mac_addr, skb->len) >= 0) |
215 | return neigh->ops->queue_xmit(skb); | 212 | return dev_queue_xmit(skb); |
216 | 213 | ||
217 | if (net_ratelimit()) | 214 | if (net_ratelimit()) |
218 | printk(KERN_DEBUG "dn_neigh_output_packet: oops, can't send packet\n"); | 215 | printk(KERN_DEBUG "dn_neigh_output_packet: oops, can't send packet\n"); |