neigh: Kill neigh_ops->hh_output
It's always dev_queue_xmit().
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index 337da24..97990dd 100644
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -122,7 +122,6 @@
void (*error_report)(struct neighbour *, struct sk_buff*);
int (*output)(struct sk_buff*);
int (*connected_output)(struct sk_buff*);
- int (*hh_output)(struct sk_buff*);
int (*queue_xmit)(struct sk_buff*);
};
diff --git a/net/atm/clip.c b/net/atm/clip.c
index 1d4be60..036cd43 100644
--- a/net/atm/clip.c
+++ b/net/atm/clip.c
@@ -273,7 +273,6 @@
.error_report = clip_neigh_error,
.output = dev_queue_xmit,
.connected_output = dev_queue_xmit,
- .hh_output = dev_queue_xmit,
.queue_xmit = dev_queue_xmit,
};
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 83f9998..c22def5 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -746,7 +746,7 @@
hh = &neigh->hh;
if (hh->hh_len)
- hh->hh_output = neigh->ops->hh_output;
+ hh->hh_output = dev_queue_xmit;
}
static void neigh_periodic_work(struct work_struct *work)
@@ -1222,7 +1222,7 @@
goto end;
if (n->nud_state & NUD_CONNECTED)
- hh->hh_output = n->ops->hh_output;
+ hh->hh_output = dev_queue_xmit;
else
hh->hh_output = n->ops->output;
diff --git a/net/decnet/dn_neigh.c b/net/decnet/dn_neigh.c
index 03eb226..abf4de8 100644
--- a/net/decnet/dn_neigh.c
+++ b/net/decnet/dn_neigh.c
@@ -64,7 +64,6 @@
.error_report = dn_long_error_report,
.output = dn_long_output,
.connected_output = dn_long_output,
- .hh_output = dev_queue_xmit,
.queue_xmit = dev_queue_xmit,
};
@@ -76,7 +75,6 @@
.error_report = dn_short_error_report,
.output = dn_short_output,
.connected_output = dn_short_output,
- .hh_output = dev_queue_xmit,
.queue_xmit = dev_queue_xmit,
};
@@ -88,7 +86,6 @@
.error_report = dn_short_error_report, /* Can use short version here */
.output = dn_phase3_output,
.connected_output = dn_phase3_output,
- .hh_output = dev_queue_xmit,
.queue_xmit = dev_queue_xmit
};
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 3e55456..f5f0aa1c 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -138,7 +138,6 @@
.error_report = arp_error_report,
.output = neigh_resolve_output,
.connected_output = neigh_connected_output,
- .hh_output = dev_queue_xmit,
.queue_xmit = dev_queue_xmit,
};
@@ -148,7 +147,6 @@
.error_report = arp_error_report,
.output = neigh_resolve_output,
.connected_output = neigh_resolve_output,
- .hh_output = dev_queue_xmit,
.queue_xmit = dev_queue_xmit,
};
@@ -156,7 +154,6 @@
.family = AF_INET,
.output = dev_queue_xmit,
.connected_output = dev_queue_xmit,
- .hh_output = dev_queue_xmit,
.queue_xmit = dev_queue_xmit,
};
@@ -166,7 +163,6 @@
.error_report = arp_error_report,
.output = neigh_compat_output,
.connected_output = neigh_compat_output,
- .hh_output = dev_queue_xmit,
.queue_xmit = dev_queue_xmit,
};
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 7596f07..db782d2 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -107,7 +107,6 @@
.error_report = ndisc_error_report,
.output = neigh_resolve_output,
.connected_output = neigh_connected_output,
- .hh_output = dev_queue_xmit,
.queue_xmit = dev_queue_xmit,
};
@@ -117,7 +116,6 @@
.error_report = ndisc_error_report,
.output = neigh_resolve_output,
.connected_output = neigh_resolve_output,
- .hh_output = dev_queue_xmit,
.queue_xmit = dev_queue_xmit,
};
@@ -126,7 +124,6 @@
.family = AF_INET6,
.output = dev_queue_xmit,
.connected_output = dev_queue_xmit,
- .hh_output = dev_queue_xmit,
.queue_xmit = dev_queue_xmit,
};