summaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2005-03-17 18:43:40 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2005-03-17 18:43:40 -0800
commitb5d04023a3b81bd10d7859f338f64bbf10e2d26d (patch)
treecdea718771a6db09fa1f02523daebbe6641468cc /include/net
parent775563eff1181489871ebc05ec9f054431686693 (diff)
[NET]: Kill dst_pmtu/dst_path_metric
This would have been the patch that removed dst->path. But ip_append_data got in the way :) However, using dst->path is only needed rarely and should always require a bit of deliberation. So let's get rid of dst_pmtu and dst_path_metric and use dst_mtu and dst_metric directly. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/dst.h17
1 files changed, 1 insertions, 16 deletions
diff --git a/include/net/dst.h b/include/net/dst.h
index f392a559b5b4..d6dd8cfd23c6 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -110,21 +110,6 @@ dst_metric(const struct dst_entry *dst, int metric)
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);
@@ -138,7 +123,7 @@ static inline u32 dst_mtu(const struct dst_entry *dst)
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;