diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-17 05:06:24 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-17 05:30:59 +0400 |
| commit | 542d4d685febf3110d1a08d0bcb9f6ef060b76f7 (patch) | |
| tree | 8bfb9b8c8f7e8d359030781367634269f843d3e3 /net/ipv6 | |
| parent | b23b5455b6458920179a1f27513ce42e70d11f37 (diff) | |
| download | linux-542d4d685febf3110d1a08d0bcb9f6ef060b76f7.tar.xz | |
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/ipv6')
| -rw-r--r-- | net/ipv6/ndisc.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index db782d2f7cc2..482b970b835a 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; |