diff options
| author | Bjoern A. Zeeb <bz@FreeBSD.org> | 2011-04-27 19:32:27 +0000 |
|---|---|---|
| committer | Bjoern A. Zeeb <bz@FreeBSD.org> | 2011-04-27 19:32:27 +0000 |
| commit | 74e9dcf7861d1f83d8dab9f5d3c1544c77b92e3c (patch) | |
| tree | b2746c2bdf2d5f0fa057e9d2a598cad63e4d6622 /sys | |
| parent | a0ae8f04e881e0b9b9344374329b60aa0c6ae106 (diff) | |
| download | src-74e9dcf7861d1f83d8dab9f5d3c1544c77b92e3c.tar.gz src-74e9dcf7861d1f83d8dab9f5d3c1544c77b92e3c.zip | |
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
Notes
Notes:
svn path=/head/; revision=221131
Diffstat (limited to 'sys')
| -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 e32b50d90250..ac1c723a0acc 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 2a4a722e3b2d..b196de2d554a 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); |