Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47ec132a authored by David S. Miller's avatar David S. Miller
Browse files

neigh: Kill neigh_ops->hh_output 



It's always dev_queue_xmit().

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0895b08a

include/net/neighbour.h

+0 −1
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ struct neigh_ops { 
	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*);

};

net/atm/clip.c

+0 −1
Original line number Diff line number Diff line
@@ -273,7 +273,6 @@ static const struct neigh_ops clip_neigh_ops = { 
	.error_report =		clip_neigh_error,

	.output =		dev_queue_xmit,

	.connected_output =	dev_queue_xmit,

	.hh_output =		dev_queue_xmit,

	.queue_xmit =		dev_queue_xmit,

};

net/core/neighbour.c

+2 −2
Original line number Diff line number Diff line
@@ -746,7 +746,7 @@ static void neigh_connect(struct neighbour *neigh) 


	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 @@ static void neigh_hh_init(struct neighbour *n, struct dst_entry *dst) 
		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;

net/decnet/dn_neigh.c

+0 −3
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ static const struct neigh_ops dn_long_ops = { 
	.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 @@ static const struct neigh_ops dn_short_ops = { 
	.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 @@ static const struct neigh_ops dn_phase3_ops = { 
	.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

};

net/ipv4/arp.c

+0 −4
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ static const struct neigh_ops arp_generic_ops = { 
	.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 @@ static const struct neigh_ops arp_hh_ops = { 
	.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 @@ static const struct neigh_ops arp_direct_ops = { 
	.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 @@ static const struct neigh_ops arp_broken_ops = { 
	.error_report =		arp_error_report,

	.output =		neigh_compat_output,

	.connected_output =	neigh_compat_output,

	.hh_output =		dev_queue_xmit,

	.queue_xmit =		dev_queue_xmit,

};