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/ipv4 | |
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/ipv4')
-rw-r--r-- | net/ipv4/arp.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c index f5f0aa1cd3ac..8a21403cdd3c 100644 --- a/net/ipv4/arp.c +++ b/net/ipv4/arp.c | |||
@@ -138,7 +138,6 @@ static const struct neigh_ops arp_generic_ops = { | |||
138 | .error_report = arp_error_report, | 138 | .error_report = arp_error_report, |
139 | .output = neigh_resolve_output, | 139 | .output = neigh_resolve_output, |
140 | .connected_output = neigh_connected_output, | 140 | .connected_output = neigh_connected_output, |
141 | .queue_xmit = dev_queue_xmit, | ||
142 | }; | 141 | }; |
143 | 142 | ||
144 | static const struct neigh_ops arp_hh_ops = { | 143 | static const struct neigh_ops arp_hh_ops = { |
@@ -147,14 +146,12 @@ static const struct neigh_ops arp_hh_ops = { | |||
147 | .error_report = arp_error_report, | 146 | .error_report = arp_error_report, |
148 | .output = neigh_resolve_output, | 147 | .output = neigh_resolve_output, |
149 | .connected_output = neigh_resolve_output, | 148 | .connected_output = neigh_resolve_output, |
150 | .queue_xmit = dev_queue_xmit, | ||
151 | }; | 149 | }; |
152 | 150 | ||
153 | static const struct neigh_ops arp_direct_ops = { | 151 | static const struct neigh_ops arp_direct_ops = { |
154 | .family = AF_INET, | 152 | .family = AF_INET, |
155 | .output = dev_queue_xmit, | 153 | .output = dev_queue_xmit, |
156 | .connected_output = dev_queue_xmit, | 154 | .connected_output = dev_queue_xmit, |
157 | .queue_xmit = dev_queue_xmit, | ||
158 | }; | 155 | }; |
159 | 156 | ||
160 | static const struct neigh_ops arp_broken_ops = { | 157 | static const struct neigh_ops arp_broken_ops = { |
@@ -163,7 +160,6 @@ static const struct neigh_ops arp_broken_ops = { | |||
163 | .error_report = arp_error_report, | 160 | .error_report = arp_error_report, |
164 | .output = neigh_compat_output, | 161 | .output = neigh_compat_output, |
165 | .connected_output = neigh_compat_output, | 162 | .connected_output = neigh_compat_output, |
166 | .queue_xmit = dev_queue_xmit, | ||
167 | }; | 163 | }; |
168 | 164 | ||
169 | struct neigh_table arp_tbl = { | 165 | struct neigh_table arp_tbl = { |
@@ -254,7 +250,7 @@ static int arp_constructor(struct neighbour *neigh) | |||
254 | if (!dev->header_ops) { | 250 | if (!dev->header_ops) { |
255 | neigh->nud_state = NUD_NOARP; | 251 | neigh->nud_state = NUD_NOARP; |
256 | neigh->ops = &arp_direct_ops; | 252 | neigh->ops = &arp_direct_ops; |
257 | neigh->output = neigh->ops->queue_xmit; | 253 | neigh->output = dev_queue_xmit; |
258 | } else { | 254 | } else { |
259 | /* Good devices (checked by reading texts, but only Ethernet is | 255 | /* Good devices (checked by reading texts, but only Ethernet is |
260 | tested) | 256 | tested) |