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>
This commit is contained in:
@@ -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;
|
||||
|
Reference in New Issue
Block a user