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

Commit ddb3b603 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by David S. Miller
Browse files

net: Remove protocol from struct dst_ops 



After my change to neigh_hh_init to obtain the protocol from the
neigh_table there are no more users of protocol in struct dst_ops.
Remove the protocol field from dst_ops and all of it's initializers.

Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 13259db5

include/net/dst_ops.h

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ struct sock; 


struct dst_ops {

	unsigned short		family;

	__be16			protocol;

	unsigned int		gc_thresh;



	int			(*gc)(struct dst_ops *ops);

net/bridge/br_nf_core.c

+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ static unsigned int fake_mtu(const struct dst_entry *dst) 


static struct dst_ops fake_dst_ops = {

	.family		= AF_INET,

	.protocol	= cpu_to_be16(ETH_P_IP),

	.update_pmtu	= fake_update_pmtu,

	.redirect	= fake_redirect,

	.cow_metrics	= fake_cow_metrics,

net/decnet/dn_route.c

+0 −1
Original line number Diff line number Diff line
@@ -136,7 +136,6 @@ int decnet_dst_gc_interval = 2; 


static struct dst_ops dn_dst_ops = {

	.family =		PF_DECnet,

	.protocol =		cpu_to_be16(ETH_P_DNA_RT),

	.gc_thresh =		128,

	.gc =			dn_dst_gc,

	.check =		dn_dst_check,

net/ipv4/route.c

+0 −2
Original line number Diff line number Diff line
@@ -152,7 +152,6 @@ static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst, 


static struct dst_ops ipv4_dst_ops = {

	.family =		AF_INET,

	.protocol =		cpu_to_be16(ETH_P_IP),

	.check =		ipv4_dst_check,

	.default_advmss =	ipv4_default_advmss,

	.mtu =			ipv4_mtu,
@@ -2225,7 +2224,6 @@ static u32 *ipv4_rt_blackhole_cow_metrics(struct dst_entry *dst, 


static struct dst_ops ipv4_dst_blackhole_ops = {

	.family			=	AF_INET,

	.protocol		=	cpu_to_be16(ETH_P_IP),

	.check			=	ipv4_blackhole_dst_check,

	.mtu			=	ipv4_blackhole_mtu,

	.default_advmss		=	ipv4_default_advmss,

net/ipv4/xfrm4_policy.c

+0 −1
Original line number Diff line number Diff line
@@ -232,7 +232,6 @@ static void xfrm4_dst_ifdown(struct dst_entry *dst, struct net_device *dev, 


static struct dst_ops xfrm4_dst_ops = {

	.family =		AF_INET,

	.protocol =		cpu_to_be16(ETH_P_IP),

	.gc =			xfrm4_garbage_collect,

	.update_pmtu =		xfrm4_update_pmtu,

	.redirect =		xfrm4_redirect,