From 6d99d3e3268cc4ca691e421cc39db4f2f9d04a47 Mon Sep 17 00:00:00 2001
From: Satoru SATOH <satoru.satoh@gmail.com>
Date: Sun, 4 May 2008 22:12:43 -0700
Subject: [PATCH] --- yaml --- r: 96069 b: refs/heads/master c:
 0bbeafd0118fc3ae54990064760c889d41dc21d6 h: refs/heads/master i:   96067:
 c069914e544321c91cba8fc808115c89b3540b04 v: v3

---
 [refs]                 | 2 +-
 trunk/include/net/ip.h | 2 +-
 trunk/net/ipv4/route.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 328f137f38dc..775501bddf7e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e0ba0060ffcee2e766ec3159196235b1a2a0ff3
+refs/heads/master: 0bbeafd0118fc3ae54990064760c889d41dc21d6
diff --git a/trunk/include/net/ip.h b/trunk/include/net/ip.h
index 6d7bcd5e62d4..3b40bc2234be 100644
--- a/trunk/include/net/ip.h
+++ b/trunk/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/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c
index 5e3685c5c407..9084055a81a4 100644
--- a/trunk/net/ipv4/route.c
+++ b/trunk/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;