PERFORCE change 153687 for review

[Marko Zec]

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

Change 153687 by zec at zec_tca51 on 2008/11/28 10:03:32

	Revert __FreeBSD_version back to 800055.
	
	Clean up XXX comments and #if 0 blocks.
	
	Discussed with: bz

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#11 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#9 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#16 edit
.. //depot/projects/vimage-commit2/src/sys/sys/param.h#20 edit

Differences ...

==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#11 (text+ko) ====

@@ -121,7 +121,7 @@
 #endif
 extern	int	ip_optcopy __P((struct ip *, struct ip *));
 
-#if (__FreeBSD_version > 460000) && (__FreeBSD_version < 800056)
+#if (__FreeBSD_version > 460000) && (__FreeBSD_version < 800055)
 extern	int	path_mtu_discovery;
 #endif
 

==== //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#9 (text+ko) ====

@@ -234,20 +234,6 @@
 
 void	in_delayed_cksum(struct mbuf *m);
 
-#if 0 /* XXX moved to netinet/vinet.h */
-static __inline uint16_t ip_newid(void);
-extern int ip_do_randomid;
-
-static __inline uint16_t
-ip_newid(void)
-{
-	if (V_ip_do_randomid)
-		return ip_randomid();
-
-	return htons(V_ip_id++);
-}
-#endif
-
 #endif /* _KERNEL */
 
 #endif /* !_NETINET_IP_VAR_H_ */

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

@@ -332,7 +332,6 @@
 #define	V_udpstat		VNET_INET(udpstat)
 #define	V_useloopback		VNET_INET(useloopback)
 
-/* XXX moved from netinet/ip_var.h */
 static __inline uint16_t ip_newid(void);
 extern int ip_do_randomid;
 

==== //depot/projects/vimage-commit2/src/sys/sys/param.h#20 (text+ko) ====

@@ -57,7 +57,7 @@
  *		is created, otherwise 1.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 800056	/* Master, propagated to newvers */
+#define __FreeBSD_version 800055	/* Master, propagated to newvers */
 
 #ifndef LOCORE
 #include <sys/types.h>