summaryrefslogtreecommitdiffstats
path: root/include/net/dst.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-12-12 21:55:08 -0800
committerDavid S. Miller <davem@davemloft.net>2010-12-12 22:08:17 -0800
commit323e126f0c5995f779d7df7fd035f6e8fed8764d (patch)
tree402c7267a45ae488363bb1ef8e4c786b65b82572 /include/net/dst.h
parenta02e4b7dae455151c423e2f69ef222c502a321fd (diff)
downloadop-kernel-dev-323e126f0c5995f779d7df7fd035f6e8fed8764d.zip
op-kernel-dev-323e126f0c5995f779d7df7fd035f6e8fed8764d.tar.gz
ipv4: Don't pre-seed hoplimit metric.
Always go through a new ip4_dst_hoplimit() helper, just like ipv6. This allowed several simplifications: 1) The interim dst_metric_hoplimit() can go as it's no longer userd. 2) The sysctl_ip_default_ttl entry no longer needs to use ipv4_doint_and_flush, since the sysctl is not cached in routing cache metrics any longer. 3) ipv4_doint_and_flush no longer needs to be exported and therefore can be marked static. When ipv4_doint_and_flush_strategy was removed some time ago, the external declaration in ip.h was mistakenly left around so kill that off too. We have to move the sysctl_ip_default_ttl declaration into ipv4's route cache definition header net/route.h, because currently net/ip.h (where the declaration lives now) has a back dependency on net/route.h Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/dst.h')
-rw-r--r--include/net/dst.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/net/dst.h b/include/net/dst.h
index 9208b50..755ac6c 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -116,12 +116,6 @@ dst_metric(const struct dst_entry *dst, const int metric)
return dst_metric_raw(dst, metric);
}
-static inline u32
-dst_metric_hoplimit(const struct dst_entry *dst)
-{
- return dst_metric_raw(dst, RTAX_HOPLIMIT);
-}
-
static inline void dst_metric_set(struct dst_entry *dst, int metric, u32 val)
{
dst->_metrics[metric-1] = val;
OpenPOWER on IntegriCloud