leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

neigh: Kill neigh_ops->hh_output

Browse Source 
It's always dev_queue_xmit().

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2011-07-16 17:39:57 -07:00
parent 0895b08ade
commit 47ec132a40
6 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/neighbour.h
View File

@ -122,7 +122,6 @@ struct neigh_ops {
void (*error_report)(struct neighbour *, struct sk_buff*); void (*error_report)(struct neighbour *, struct sk_buff*);
int (*output)(struct sk_buff*); int (*output)(struct sk_buff*);
int (*connected_output)(struct sk_buff*); int (*connected_output)(struct sk_buff*);
int (*hh_output)(struct sk_buff*);
int (*queue_xmit)(struct sk_buff*); int (*queue_xmit)(struct sk_buff*);
}; };

1
net/atm/clip.c
View File

@ -273,7 +273,6 @@ static const struct neigh_ops clip_neigh_ops = {
.error_report = clip_neigh_error, .error_report = clip_neigh_error,
.output = dev_queue_xmit, .output = dev_queue_xmit,
.connected_output = dev_queue_xmit, .connected_output = dev_queue_xmit,
.hh_output = dev_queue_xmit,
.queue_xmit = dev_queue_xmit, .queue_xmit = dev_queue_xmit,
}; };

4
net/core/neighbour.c
View File

@ -746,7 +746,7 @@ static void neigh_connect(struct neighbour *neigh)
hh = &neigh->hh; hh = &neigh->hh;
if (hh->hh_len) 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) static void neigh_periodic_work(struct work_struct *work)
@ -1222,7 +1222,7 @@ static void neigh_hh_init(struct neighbour *n, struct dst_entry *dst)
goto end; goto end;
if (n->nud_state & NUD_CONNECTED) if (n->nud_state & NUD_CONNECTED)
hh->hh_output = n->ops->hh_output; hh->hh_output = dev_queue_xmit;
else else
hh->hh_output = n->ops->output; hh->hh_output = n->ops->output;

3
net/decnet/dn_neigh.c
View File

@ -64,7 +64,6 @@ static const struct neigh_ops dn_long_ops = {
.error_report = dn_long_error_report, .error_report = dn_long_error_report,
.output = dn_long_output, .output = dn_long_output,
.connected_output = dn_long_output, .connected_output = dn_long_output,
.hh_output = dev_queue_xmit,
.queue_xmit = dev_queue_xmit, .queue_xmit = dev_queue_xmit,
}; };
@ -76,7 +75,6 @@ static const struct neigh_ops dn_short_ops = {
.error_report = dn_short_error_report, .error_report = dn_short_error_report,
.output = dn_short_output, .output = dn_short_output,
.connected_output = dn_short_output, .connected_output = dn_short_output,
.hh_output = dev_queue_xmit,
.queue_xmit = dev_queue_xmit, .queue_xmit = dev_queue_xmit,
}; };
@ -88,7 +86,6 @@ static const struct neigh_ops dn_phase3_ops = {
.error_report = dn_short_error_report, /* Can use short version here */ .error_report = dn_short_error_report, /* Can use short version here */
.output = dn_phase3_output, .output = dn_phase3_output,
.connected_output = dn_phase3_output, .connected_output = dn_phase3_output,
.hh_output = dev_queue_xmit,
.queue_xmit = dev_queue_xmit .queue_xmit = dev_queue_xmit
}; };

4
net/ipv4/arp.c
View File

@ -138,7 +138,6 @@ static const struct neigh_ops arp_generic_ops = {
.error_report = arp_error_report, .error_report = arp_error_report,
.output = neigh_resolve_output, .output = neigh_resolve_output,
.connected_output = neigh_connected_output, .connected_output = neigh_connected_output,
.hh_output = dev_queue_xmit,
.queue_xmit = dev_queue_xmit, .queue_xmit = dev_queue_xmit,
}; };
@ -148,7 +147,6 @@ static const struct neigh_ops arp_hh_ops = {
.error_report = arp_error_report, .error_report = arp_error_report,
.output = neigh_resolve_output, .output = neigh_resolve_output,
.connected_output = neigh_resolve_output, .connected_output = neigh_resolve_output,
.hh_output = dev_queue_xmit,
.queue_xmit = dev_queue_xmit, .queue_xmit = dev_queue_xmit,
}; };
@ -156,7 +154,6 @@ static const struct neigh_ops arp_direct_ops = {
.family = AF_INET, .family = AF_INET,
.output = dev_queue_xmit, .output = dev_queue_xmit,
.connected_output = dev_queue_xmit, .connected_output = dev_queue_xmit,
.hh_output = dev_queue_xmit,
.queue_xmit = dev_queue_xmit, .queue_xmit = dev_queue_xmit,
}; };
@ -166,7 +163,6 @@ static const struct neigh_ops arp_broken_ops = {
.error_report = arp_error_report, .error_report = arp_error_report,
.output = neigh_compat_output, .output = neigh_compat_output,
.connected_output = neigh_compat_output, .connected_output = neigh_compat_output,
.hh_output = dev_queue_xmit,
.queue_xmit = dev_queue_xmit, .queue_xmit = dev_queue_xmit,
}; };

3
net/ipv6/ndisc.c
View File

@ -107,7 +107,6 @@ static const struct neigh_ops ndisc_generic_ops = {
.error_report = ndisc_error_report, .error_report = ndisc_error_report,
.output = neigh_resolve_output, .output = neigh_resolve_output,
.connected_output = neigh_connected_output, .connected_output = neigh_connected_output,
.hh_output = dev_queue_xmit,
.queue_xmit = dev_queue_xmit, .queue_xmit = dev_queue_xmit,
}; };
@ -117,7 +116,6 @@ static const struct neigh_ops ndisc_hh_ops = {
.error_report = ndisc_error_report, .error_report = ndisc_error_report,
.output = neigh_resolve_output, .output = neigh_resolve_output,
.connected_output = neigh_resolve_output, .connected_output = neigh_resolve_output,
.hh_output = dev_queue_xmit,
.queue_xmit = dev_queue_xmit, .queue_xmit = dev_queue_xmit,
}; };
@ -126,7 +124,6 @@ static const struct neigh_ops ndisc_direct_ops = {
.family = AF_INET6, .family = AF_INET6,
.output = dev_queue_xmit, .output = dev_queue_xmit,
.connected_output = dev_queue_xmit, .connected_output = dev_queue_xmit,
.hh_output = dev_queue_xmit,
.queue_xmit = dev_queue_xmit, .queue_xmit = dev_queue_xmit,
}; };