diff options
author | David S. Miller <davem@davemloft.net> | 2011-07-17 16:34:11 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-07-18 02:11:17 -0400 |
commit | 8f40b161de4f27402b4c0659ad2ae83fad5a0cdd (patch) | |
tree | 9e2dbd4ba8a66916c690b0e5791ac25ea0958c26 /net/ipv4 | |
parent | 69ecca86da4890c13a5e29c51b4ac76a1a8a62c9 (diff) |
neigh: Pass neighbour entry to output ops.
This will get us closer to being able to do "neigh stuff"
completely independent of the underlying dst_entry for
protocols (ipv4/ipv6) that wish to do so.
We will also be able to make dst entries neigh-less.
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, 3 insertions, 3 deletions
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c index 8a21403cdd3c..96a164aa1367 100644 --- a/net/ipv4/arp.c +++ b/net/ipv4/arp.c | |||
@@ -150,8 +150,8 @@ static const struct neigh_ops arp_hh_ops = { | |||
150 | 150 | ||
151 | static const struct neigh_ops arp_direct_ops = { | 151 | static const struct neigh_ops arp_direct_ops = { |
152 | .family = AF_INET, | 152 | .family = AF_INET, |
153 | .output = dev_queue_xmit, | 153 | .output = neigh_direct_output, |
154 | .connected_output = dev_queue_xmit, | 154 | .connected_output = neigh_direct_output, |
155 | }; | 155 | }; |
156 | 156 | ||
157 | static const struct neigh_ops arp_broken_ops = { | 157 | static const struct neigh_ops arp_broken_ops = { |
@@ -250,7 +250,7 @@ static int arp_constructor(struct neighbour *neigh) | |||
250 | if (!dev->header_ops) { | 250 | if (!dev->header_ops) { |
251 | neigh->nud_state = NUD_NOARP; | 251 | neigh->nud_state = NUD_NOARP; |
252 | neigh->ops = &arp_direct_ops; | 252 | neigh->ops = &arp_direct_ops; |
253 | neigh->output = dev_queue_xmit; | 253 | neigh->output = neigh_direct_output; |
254 | } else { | 254 | } else { |
255 | /* Good devices (checked by reading texts, but only Ethernet is | 255 | /* Good devices (checked by reading texts, but only Ethernet is |
256 | tested) | 256 | tested) |