From owner-p4-projects@FreeBSD.ORG Fri Nov 28 10:04:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 226611065675; Fri, 28 Nov 2008 10:04:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D0223106564A for ; Fri, 28 Nov 2008 10:04:25 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C08078FC12 for ; Fri, 28 Nov 2008 10:04:25 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mASA4P78007263 for ; Fri, 28 Nov 2008 10:04:25 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mASA4PSU007261 for perforce@freebsd.org; Fri, 28 Nov 2008 10:04:25 GMT (envelope-from zec@tel.fer.hr) Date: Fri, 28 Nov 2008 10:04:25 GMT Message-Id: <200811281004.mASA4PSU007261@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153687 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Nov 2008 10:04:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=153687 Change 153687 by zec@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