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>
Showing
- drivers/net/pptp.c 1 addition, 1 deletiondrivers/net/pptp.c
- include/net/dst.h 0 additions, 6 deletionsinclude/net/dst.h
- include/net/ip.h 0 additions, 10 deletionsinclude/net/ip.h
- include/net/route.h 11 additions, 0 deletionsinclude/net/route.h
- net/ipv4/devinet.c 3 additions, 3 deletionsnet/ipv4/devinet.c
- net/ipv4/ip_gre.c 1 addition, 1 deletionnet/ipv4/ip_gre.c
- net/ipv4/ip_output.c 2 additions, 1 deletionnet/ipv4/ip_output.c
- net/ipv4/netfilter/ipt_REJECT.c 1 addition, 1 deletionnet/ipv4/netfilter/ipt_REJECT.c
- net/ipv4/route.c 0 additions, 2 deletionsnet/ipv4/route.c
- net/ipv4/sysctl_net_ipv4.c 1 addition, 1 deletionnet/ipv4/sysctl_net_ipv4.c
- net/ipv4/xfrm4_mode_tunnel.c 1 addition, 1 deletionnet/ipv4/xfrm4_mode_tunnel.c
Loading
Please register or sign in to comment