svn commit: r221131 - head/sys/netinet

[Bjoern A. Zeeb]

Author: bz
Date: Wed Apr 27 19:32:27 2011
New Revision: 221131
URL: http://svn.freebsd.org/changeset/base/221131

Log:
  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

Modified:
  head/sys/netinet/ip_input.c
  head/sys/netinet/raw_ip.c

Modified: head/sys/netinet/ip_input.c
==============================================================================
--- head/sys/netinet/ip_input.c	Wed Apr 27 19:30:44 2011	(r221130)
+++ head/sys/netinet/ip_input.c	Wed Apr 27 19:32:27 2011	(r221131)
@@ -101,11 +101,6 @@ SYSCTL_VNET_INT(_net_inet_ip, IPCTL_SEND
     &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,

Modified: head/sys/netinet/raw_ip.c
==============================================================================
--- head/sys/netinet/raw_ip.c	Wed Apr 27 19:30:44 2011	(r221130)
+++ head/sys/netinet/raw_ip.c	Wed Apr 27 19:32:27 2011	(r221131)
@@ -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);