Commit ebb762f2 authored by Steffen Klassert's avatar Steffen Klassert Committed by David S. Miller
Browse files

net: Rename the dst_opt default_mtu method to mtu 



We plan to invoke the dst_opt->default_mtu() method unconditioally
from dst_mtu(). So rename the method to dst_opt->mtu() to match
the name with the new meaning.

Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6b600b26

include/net/dst.h

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static inline u32 dst_mtu(const struct dst_entry *dst) 
	u32 mtu = dst_metric_raw(dst, RTAX_MTU);



	if (!mtu)

		mtu = dst->ops->default_mtu(dst);

		mtu = dst->ops->mtu(dst);



	return mtu;

}

include/net/dst_ops.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ struct dst_ops { 
	int			(*gc)(struct dst_ops *ops);

	struct dst_entry *	(*check)(struct dst_entry *, __u32 cookie);

	unsigned int		(*default_advmss)(const struct dst_entry *);

	unsigned int		(*default_mtu)(const struct dst_entry *);

	unsigned int		(*mtu)(const struct dst_entry *);

	u32 *			(*cow_metrics)(struct dst_entry *, unsigned long);

	void			(*destroy)(struct dst_entry *);

	void			(*ifdown)(struct dst_entry *,

net/decnet/dn_route.c

+3 −3
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static unsigned long dn_rt_deadline; 
static int dn_dst_gc(struct dst_ops *ops);

static struct dst_entry *dn_dst_check(struct dst_entry *, __u32);

static unsigned int dn_dst_default_advmss(const struct dst_entry *dst);

static unsigned int dn_dst_default_mtu(const struct dst_entry *dst);

static unsigned int dn_dst_mtu(const struct dst_entry *dst);

static void dn_dst_destroy(struct dst_entry *);

static struct dst_entry *dn_dst_negative_advice(struct dst_entry *);

static void dn_dst_link_failure(struct sk_buff *);
@@ -135,7 +135,7 @@ static struct dst_ops dn_dst_ops = { 
	.gc =			dn_dst_gc,

	.check =		dn_dst_check,

	.default_advmss =	dn_dst_default_advmss,

	.default_mtu =		dn_dst_default_mtu,

	.mtu =			dn_dst_mtu,

	.cow_metrics =		dst_cow_metrics_generic,

	.destroy =		dn_dst_destroy,

	.negative_advice =	dn_dst_negative_advice,
@@ -825,7 +825,7 @@ static unsigned int dn_dst_default_advmss(const struct dst_entry *dst) 
	return dn_mss_from_pmtu(dst->dev, dst_mtu(dst));

}



static unsigned int dn_dst_default_mtu(const struct dst_entry *dst)

static unsigned int dn_dst_mtu(const struct dst_entry *dst)

{

	return dst->dev->mtu;

}

net/ipv4/route.c

+5 −5
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static int rt_chain_length_max __read_mostly = 20; 


static struct dst_entry *ipv4_dst_check(struct dst_entry *dst, u32 cookie);

static unsigned int	 ipv4_default_advmss(const struct dst_entry *dst);

static unsigned int	 ipv4_default_mtu(const struct dst_entry *dst);

static unsigned int	 ipv4_mtu(const struct dst_entry *dst);

static void		 ipv4_dst_destroy(struct dst_entry *dst);

static struct dst_entry *ipv4_negative_advice(struct dst_entry *dst);

static void		 ipv4_link_failure(struct sk_buff *skb);
@@ -193,7 +193,7 @@ static struct dst_ops ipv4_dst_ops = { 
	.gc =			rt_garbage_collect,

	.check =		ipv4_dst_check,

	.default_advmss =	ipv4_default_advmss,

	.default_mtu =		ipv4_default_mtu,

	.mtu =			ipv4_mtu,

	.cow_metrics =		ipv4_cow_metrics,

	.destroy =		ipv4_dst_destroy,

	.ifdown =		ipv4_dst_ifdown,
@@ -1814,7 +1814,7 @@ static unsigned int ipv4_default_advmss(const struct dst_entry *dst) 
	return advmss;

}



static unsigned int ipv4_default_mtu(const struct dst_entry *dst)

static unsigned int ipv4_mtu(const struct dst_entry *dst)

{

	unsigned int mtu = dst->dev->mtu;
@@ -2755,7 +2755,7 @@ static struct dst_entry *ipv4_blackhole_dst_check(struct dst_entry *dst, u32 coo 
	return NULL;

}



static unsigned int ipv4_blackhole_default_mtu(const struct dst_entry *dst)

static unsigned int ipv4_blackhole_mtu(const struct dst_entry *dst)

{

	return dst->dev->mtu;

}
@@ -2775,7 +2775,7 @@ static struct dst_ops ipv4_dst_blackhole_ops = { 
	.protocol		=	cpu_to_be16(ETH_P_IP),

	.destroy		=	ipv4_dst_destroy,

	.check			=	ipv4_blackhole_dst_check,

	.default_mtu		=	ipv4_blackhole_default_mtu,

	.mtu			=	ipv4_blackhole_mtu,

	.default_advmss		=	ipv4_default_advmss,

	.update_pmtu		=	ipv4_rt_blackhole_update_pmtu,

	.cow_metrics		=	ipv4_rt_blackhole_cow_metrics,

net/ipv6/route.c

+5 −5
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static struct rt6_info *ip6_rt_copy(const struct rt6_info *ort, 
				    const struct in6_addr *dest);

static struct dst_entry	*ip6_dst_check(struct dst_entry *dst, u32 cookie);

static unsigned int	 ip6_default_advmss(const struct dst_entry *dst);

static unsigned int	 ip6_default_mtu(const struct dst_entry *dst);

static unsigned int	 ip6_mtu(const struct dst_entry *dst);

static struct dst_entry *ip6_negative_advice(struct dst_entry *);

static void		ip6_dst_destroy(struct dst_entry *);

static void		ip6_dst_ifdown(struct dst_entry *,
@@ -144,7 +144,7 @@ static struct dst_ops ip6_dst_ops_template = { 
	.gc_thresh		=	1024,

	.check			=	ip6_dst_check,

	.default_advmss		=	ip6_default_advmss,

	.default_mtu		=	ip6_default_mtu,

	.mtu			=	ip6_mtu,

	.cow_metrics		=	ipv6_cow_metrics,

	.destroy		=	ip6_dst_destroy,

	.ifdown			=	ip6_dst_ifdown,
@@ -155,7 +155,7 @@ static struct dst_ops ip6_dst_ops_template = { 
	.neigh_lookup		=	ip6_neigh_lookup,

};



static unsigned int ip6_blackhole_default_mtu(const struct dst_entry *dst)

static unsigned int ip6_blackhole_mtu(const struct dst_entry *dst)

{

	return dst->dev->mtu;

}
@@ -175,7 +175,7 @@ static struct dst_ops ip6_dst_blackhole_ops = { 
	.protocol		=	cpu_to_be16(ETH_P_IPV6),

	.destroy		=	ip6_dst_destroy,

	.check			=	ip6_dst_check,

	.default_mtu		=	ip6_blackhole_default_mtu,

	.mtu			=	ip6_blackhole_mtu,

	.default_advmss		=	ip6_default_advmss,

	.update_pmtu		=	ip6_rt_blackhole_update_pmtu,

	.cow_metrics		=	ip6_rt_blackhole_cow_metrics,
@@ -1041,7 +1041,7 @@ static unsigned int ip6_default_advmss(const struct dst_entry *dst) 
	return mtu;

}



static unsigned int ip6_default_mtu(const struct dst_entry *dst)

static unsigned int ip6_mtu(const struct dst_entry *dst)

{

	unsigned int mtu = IPV6_MIN_MTU;

	struct inet6_dev *idev;