diff options
author | bz <bz@FreeBSD.org> | 2011-04-27 19:32:27 +0000 |
---|---|---|
committer | bz <bz@FreeBSD.org> | 2011-04-27 19:32:27 +0000 |
commit | d6e97eaa7bfc6dfbdac2d2e9212d2d587c5d8169 (patch) | |
tree | b2746c2bdf2d5f0fa057e9d2a598cad63e4d6622 /sys/netinet | |
parent | 19104877222319644c02e765fc7a731750eaa78f (diff) | |
download | FreeBSD-src-d6e97eaa7bfc6dfbdac2d2e9212d2d587c5d8169.zip FreeBSD-src-d6e97eaa7bfc6dfbdac2d2e9212d2d587c5d8169.tar.gz |
MfP4 CH=192004:
Move ip_defttl to raw_ip.c where it is actually used. In an IPv6
only world we do not want to compile ip_input.c in for that and
it is a shared default with INET6.
Reviewed by: gnn
Sponsored by: The FreeBSD Foundation
Sponsored by: iXsystems
MFC after: 4 days
Diffstat (limited to 'sys/netinet')
-rw-r--r-- | sys/netinet/ip_input.c | 5 | ||||
-rw-r--r-- | sys/netinet/raw_ip.c | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index e32b50d..ac1c723 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -101,11 +101,6 @@ SYSCTL_VNET_INT(_net_inet_ip, IPCTL_SENDREDIRECTS, redirect, CTLFLAG_RW, &VNET_NAME(ipsendredirects), 0, "Enable sending IP redirects"); -VNET_DEFINE(int, ip_defttl) = IPDEFTTL; -SYSCTL_VNET_INT(_net_inet_ip, IPCTL_DEFTTL, ttl, CTLFLAG_RW, - &VNET_NAME(ip_defttl), 0, - "Maximum TTL on IP packets"); - static VNET_DEFINE(int, ip_keepfaith); #define V_ip_keepfaith VNET(ip_keepfaith) SYSCTL_VNET_INT(_net_inet_ip, IPCTL_KEEPFAITH, keepfaith, CTLFLAG_RW, diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 2a4a722..b196de2 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -74,6 +74,11 @@ __FBSDID("$FreeBSD$"); #include <security/mac/mac_framework.h> +VNET_DEFINE(int, ip_defttl) = IPDEFTTL; +SYSCTL_VNET_INT(_net_inet_ip, IPCTL_DEFTTL, ttl, CTLFLAG_RW, + &VNET_NAME(ip_defttl), 0, + "Maximum TTL on IP packets"); + VNET_DEFINE(struct inpcbhead, ripcb); VNET_DEFINE(struct inpcbinfo, ripcbinfo); |