PERFORCE change 114450 for review

[Marko Zec]

http://perforce.freebsd.org/chv.cgi?CH=114450

Change 114450 by zec at zec_tinderbox on 2007/02/13 13:39:56

	Fix compilation problems with options gif anod nooptions INET6.

Affected files ...

.. //depot/projects/vimage/src/sys/netinet/in_gif.c#4 edit
.. //depot/projects/vimage/src/sys/netinet/in_gif.h#3 edit
.. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#9 edit
.. //depot/projects/vimage/src/sys/netinet/tcp_input.c#6 edit
.. //depot/projects/vimage/src/sys/netinet/vinet.h#10 edit

Differences ...

==== //depot/projects/vimage/src/sys/netinet/in_gif.c#4 (text+ko) ====

@@ -86,7 +86,7 @@
 };
 
 #ifndef VIMAGE
-static int ip_gif_ttl;
+int ip_gif_ttl;
 #endif
 SYSCTL_V_INT(V_NET, vnet_gif, _net_inet_ip, IPCTL_GIF_TTL, gifttl,
 	CTLFLAG_RW, ip_gif_ttl,	0, "");

==== //depot/projects/vimage/src/sys/netinet/in_gif.h#3 (text+ko) ====

@@ -35,6 +35,9 @@
 
 #define GIF_TTL		30
 
+#ifndef VIMAGE
+extern int ip_gif_ttl;
+#endif
 struct gif_softc;
 void in_gif_input(struct mbuf *, int);
 int in_gif_output(struct ifnet *, int, struct mbuf *);

==== //depot/projects/vimage/src/sys/netinet/ip_fw2.c#9 (text+ko) ====

@@ -307,13 +307,14 @@
 SYSCTL_V_INT(V_NET, vnet_ipfw, _net_inet_ip_fw, OID_AUTO, dyn_keepalive,
     CTLFLAG_RW, dyn_keepalive, 0, "Enable keepalives for dyn. rules");
 
+#ifndef VIMAGE
+static int fw_deny_unknown_exthdrs;
+#endif
+
 #ifdef INET6
 /*
  * IPv6 specific variables
  */
-#ifndef VIMAGE
-static int fw_deny_unknown_exthdrs;
-#endif
 
 SYSCTL_DECL(_net_inet6_ip6);
 SYSCTL_NODE(_net_inet6_ip6, OID_AUTO, fw, CTLFLAG_RW | CTLFLAG_SECURE,

==== //depot/projects/vimage/src/sys/netinet/tcp_input.c#6 (text+ko) ====

@@ -443,7 +443,9 @@
 	int off0;
 {
 	INIT_VNET_INET(curvnetb);
+#ifdef INET6
 	INIT_VNET_INET6(curvnetb);
+#endif
 	register struct tcphdr *th;
 	register struct ip *ip = NULL;
 	register struct ipovly *ipov;

==== //depot/projects/vimage/src/sys/netinet/vinet.h#10 (text+ko) ====

@@ -104,8 +104,6 @@
 
 	int	_rtq_timeout;
 	struct	callout _rtq_timer;
-
-	int	_ip_gif_ttl;
 };
 
 extern struct vnet_inet vnet_inet_0;
@@ -169,6 +167,4 @@
 #define V_rtq_timeout		VNET_INET(rtq_timeout)
 #define V_rtq_timer		VNET_INET(rtq_timer)
 
-#define V_ip_gif_ttl		VNET_INET(ip_gif_ttl)
-
 #endif /* !_NETINET_VINET_H_ */