===== include/net/dst.h 1.29 vs edited =====
--- 1.29/include/net/dst.h	2005-03-11 13:17:32 +11:00
+++ edited/include/net/dst.h	2005-03-18 21:08:56 +11:00
@@ -109,21 +109,6 @@
 	return dst->metrics[metric-1];
 }
 
-static inline u32
-dst_path_metric(const struct dst_entry *dst, int metric)
-{
-	return dst->path->metrics[metric-1];
-}
-
-static inline u32
-dst_pmtu(const struct dst_entry *dst)
-{
-	u32 mtu = dst_path_metric(dst, RTAX_MTU);
-	/* Yes, _exactly_. This is paranoia. */
-	barrier();
-	return mtu;
-}
-
 static inline u32 dst_mtu(const struct dst_entry *dst)
 {
 	u32 mtu = dst_metric(dst, RTAX_MTU);
@@ -137,7 +122,7 @@
 static inline u32
 dst_allfrag(const struct dst_entry *dst)
 {
-	int ret = dst_path_metric(dst, RTAX_FEATURES) & RTAX_FEATURE_ALLFRAG;
+	int ret = dst_metric(dst->path, RTAX_FEATURES) & RTAX_FEATURE_ALLFRAG;
 	/* Yes, _exactly_. This is paranoia. */
 	barrier();
 	return ret;
===== net/ipv4/ip_output.c 1.79 vs edited =====
--- 1.79/net/ipv4/ip_output.c	2005-03-17 09:02:36 +11:00
+++ edited/net/ipv4/ip_output.c	2005-03-18 21:00:08 +11:00
@@ -746,7 +746,7 @@
 			inet->cork.addr = ipc->addr;
 		}
 		dst_hold(&rt->u.dst);
-		inet->cork.fragsize = mtu = dst_pmtu(&rt->u.dst);
+		inet->cork.fragsize = mtu = dst_mtu(rt->u.dst.path);
 		inet->cork.rt = rt;
 		inet->cork.length = 0;
 		sk->sk_sndmsg_page = NULL;
===== net/ipv6/ip6_output.c 1.89 vs edited =====
--- 1.89/net/ipv6/ip6_output.c	2005-03-17 09:02:36 +11:00
+++ edited/net/ipv6/ip6_output.c	2005-03-18 21:00:08 +11:00
@@ -850,7 +850,7 @@
 		np->cork.rt = rt;
 		inet->cork.fl = *fl;
 		np->cork.hop_limit = hlimit;
-		inet->cork.fragsize = mtu = dst_pmtu(&rt->u.dst);
+		inet->cork.fragsize = mtu = dst_mtu(rt->u.dst.path);
 		if (dst_allfrag(&rt->u.dst))
 			inet->cork.flags |= IPCORK_ALLFRAG;
 		inet->cork.length = 0;