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

Commit 0bbeafd0 authored by Satoru SATOH's avatar Satoru SATOH Committed by David S. Miller
Browse files

ip: Make use of the inline function dst_metric_locked() 



Signed-off-by: default avatarSatoru SATOH <satoru.satoh@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1e0ba006

include/net/ip.h

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ int ip_dont_fragment(struct sock *sk, struct dst_entry *dst) 
{

	return (inet_sk(sk)->pmtudisc == IP_PMTUDISC_DO ||

		(inet_sk(sk)->pmtudisc == IP_PMTUDISC_WANT &&

		 !(dst_metric(dst, RTAX_LOCK)&(1<<RTAX_MTU))));

		 !(dst_metric_locked(dst, RTAX_MTU))));

}



extern void __ip_select_ident(struct iphdr *iph, struct dst_entry *dst, int more);

net/ipv4/route.c

+1 −1
Original line number Diff line number Diff line
@@ -1613,7 +1613,7 @@ static void rt_set_nexthop(struct rtable *rt, struct fib_result *res, u32 itag) 
		       sizeof(rt->u.dst.metrics));

		if (fi->fib_mtu == 0) {

			rt->u.dst.metrics[RTAX_MTU-1] = rt->u.dst.dev->mtu;

			if (rt->u.dst.metrics[RTAX_LOCK-1] & (1 << RTAX_MTU) &&

			if (dst_metric_locked(&rt->u.dst, RTAX_MTU) &&

			    rt->rt_gateway != rt->rt_dst &&

			    rt->u.dst.dev->mtu > 576)

				rt->u.dst.metrics[RTAX_MTU-1] = 576;