aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-07-16 21:06:24 -0400
committerDavid S. Miller <davem@davemloft.net>2011-07-16 21:30:59 -0400
commit542d4d685febf3110d1a08d0bcb9f6ef060b76f7 (patch)
tree8bfb9b8c8f7e8d359030781367634269f843d3e3 /net/ipv6
parentb23b5455b6458920179a1f27513ce42e70d11f37 (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/ipv6')
-rw-r--r--net/ipv6/ndisc.c5
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 = {
107 .error_report = ndisc_error_report, 107 .error_report = ndisc_error_report,
108 .output = neigh_resolve_output, 108 .output = neigh_resolve_output,
109 .connected_output = neigh_connected_output, 109 .connected_output = neigh_connected_output,
110 .queue_xmit = dev_queue_xmit,
111}; 110};
112 111
113static const struct neigh_ops ndisc_hh_ops = { 112static const struct neigh_ops ndisc_hh_ops = {
@@ -116,7 +115,6 @@ static const struct neigh_ops ndisc_hh_ops = {
116 .error_report = ndisc_error_report, 115 .error_report = ndisc_error_report,
117 .output = neigh_resolve_output, 116 .output = neigh_resolve_output,
118 .connected_output = neigh_resolve_output, 117 .connected_output = neigh_resolve_output,
119 .queue_xmit = dev_queue_xmit,
120}; 118};
121 119
122 120
@@ -124,7 +122,6 @@ static const struct neigh_ops ndisc_direct_ops = {
124 .family = AF_INET6, 122 .family = AF_INET6,
125 .output = dev_queue_xmit, 123 .output = dev_queue_xmit,
126 .connected_output = dev_queue_xmit, 124 .connected_output = dev_queue_xmit,
127 .queue_xmit = dev_queue_xmit,
128}; 125};
129 126
130struct neigh_table nd_tbl = { 127struct neigh_table nd_tbl = {
@@ -389,7 +386,7 @@ static int ndisc_constructor(struct neighbour *neigh)
389 if (!dev->header_ops) { 386 if (!dev->header_ops) {
390 neigh->nud_state = NUD_NOARP; 387 neigh->nud_state = NUD_NOARP;
391 neigh->ops = &ndisc_direct_ops; 388 neigh->ops = &ndisc_direct_ops;
392 neigh->output = neigh->ops->queue_xmit; 389 neigh->output = dev_queue_xmit;
393 } else { 390 } else {
394 if (is_multicast) { 391 if (is_multicast) {
395 neigh->nud_state = NUD_NOARP; 392 neigh->nud_state = NUD_NOARP;