commit 0bbeafd0118fc3ae54990064760c889d41dc21d6

tjh.dev / kernel

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

fork atom

ip: Make use of the inline function dst_metric_locked()

Signed-off-by: Satoru SATOH <satoru.satoh@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Satoru SATOH and committed by

David S. Miller 18 years ago 0bbeafd0 1e0ba006

+2 -2

2 changed files

expand all

unified split

include

net

ip.h

net

ipv4

route.c

+1 -1

include/net/ip.h

··· 210 210 { 211 211 return (inet_sk(sk)->pmtudisc == IP_PMTUDISC_DO || 212 212 (inet_sk(sk)->pmtudisc == IP_PMTUDISC_WANT && 213 - !(dst_metric(dst, RTAX_LOCK)&(1<<RTAX_MTU)))); 213 + !(dst_metric_locked(dst, RTAX_MTU)))); 214 214 } 215 215 216 216 extern void __ip_select_ident(struct iphdr *iph, struct dst_entry *dst, int more);

+1 -1

net/ipv4/route.c

··· 1613 1613 sizeof(rt->u.dst.metrics)); 1614 1614 if (fi->fib_mtu == 0) { 1615 1615 rt->u.dst.metrics[RTAX_MTU-1] = rt->u.dst.dev->mtu; 1616 - if (rt->u.dst.metrics[RTAX_LOCK-1] & (1 << RTAX_MTU) && 1616 + if (dst_metric_locked(&rt->u.dst, RTAX_MTU) && 1617 1617 rt->rt_gateway != rt->rt_dst && 1618 1618 rt->u.dst.dev->mtu > 576) 1619 1619 rt->u.dst.metrics[RTAX_MTU-1] = 576;