diff options
| author |   Satoru SATOH <satoru.satoh@gmail.com> | 2008-05-04 22:12:43 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2008-05-04 22:12:43 -0700 |
| commit | 0bbeafd0118fc3ae54990064760c889d41dc21d6 (patch) | |
| tree | f0df25cd51f7cfcf8b2ee5922ac2faded84d4f2c | |
| parent | atm: Bad locking on br2684_devs modifications. (diff) | |
| download | linux-dev-0bbeafd0118fc3ae54990064760c889d41dc21d6.tar.xz linux-dev-0bbeafd0118fc3ae54990064760c889d41dc21d6.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | include/net/ip.h | 2 | ||||
| -rw-r--r-- | net/ipv4/route.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/net/ip.h b/include/net/ip.h index 6d7bcd5e62d4..3b40bc2234be 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -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); diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 5e3685c5c407..9084055a81a4 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -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; |