From owner-svn-src-projects@FreeBSD.ORG  Fri Aug 13 03:17:34 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 330691065695;
	Fri, 13 Aug 2010 03:17:34 +0000 (UTC)
	(envelope-from jeff@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2329F8FC2A;
	Fri, 13 Aug 2010 03:17:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7D3HYXU077937;
	Fri, 13 Aug 2010 03:17:34 GMT (envelope-from jeff@svn.freebsd.org)
Received: (from jeff@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7D3HYAX077935;
	Fri, 13 Aug 2010 03:17:34 GMT (envelope-from jeff@svn.freebsd.org)
Message-Id: <201008130317.o7D3HYAX077935@svn.freebsd.org>
From: Jeff Roberson <jeff@FreeBSD.org>
Date: Fri, 13 Aug 2010 03:17:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r211269 - projects/ofed/head/sys/netinet
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Aug 2010 03:17:34 -0000

Author: jeff
Date: Fri Aug 13 03:17:33 2010
New Revision: 211269
URL: http://svn.freebsd.org/changeset/base/211269

Log:
   - Fix a bug that is certainly fixed in current already so that others don't
     run into it while testing this branch.

Modified:
  projects/ofed/head/sys/netinet/ip_var.h

Modified: projects/ofed/head/sys/netinet/ip_var.h
==============================================================================
--- projects/ofed/head/sys/netinet/ip_var.h	Fri Aug 13 03:17:03 2010	(r211268)
+++ projects/ofed/head/sys/netinet/ip_var.h	Fri Aug 13 03:17:33 2010	(r211269)
@@ -307,8 +307,7 @@ extern int	(*ip_dn_io_ptr)(struct mbuf *
 
 VNET_DECLARE(int, ip_do_randomid);
 #define	V_ip_do_randomid	VNET(ip_do_randomid)
-#define	ip_newid()	((V_ip_do_randomid != 0) ? ip_randomid() : \
-			    htons(V_ip_id++))
+#define	ip_newid()	ip_randomid()
 
 #endif /* _KERNEL */