From owner-svn-src-stable-7@FreeBSD.ORG  Fri Oct 10 21:18:12 2008
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A84091065687;
	Fri, 10 Oct 2008 21:18:12 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9D4B38FC12;
	Fri, 10 Oct 2008 21:18:12 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9ALICLB001204;
	Fri, 10 Oct 2008 21:18:12 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9ALIC5M001203;
	Fri, 10 Oct 2008 21:18:12 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200810102118.m9ALIC5M001203@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Fri, 10 Oct 2008 21:18:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r183753 - stable/7/sys/netinet
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Oct 2008 21:18:12 -0000

Author: rwatson
Date: Fri Oct 10 21:18:12 2008
New Revision: 183753
URL: http://svn.freebsd.org/changeset/base/183753

Log:
  Test the soreceive_dgram tunable and set up the pr_usrreqs structure
  during UDP initialization, not during UDP inpcb initialization.
  
  Reported by:	Vlad GALU <dudu at dudu dot ro>
  Approved by:	re (kib)

Modified:
  stable/7/sys/netinet/udp_usrreq.c

Modified: stable/7/sys/netinet/udp_usrreq.c
==============================================================================
--- stable/7/sys/netinet/udp_usrreq.c	Fri Oct 10 20:05:15 2008	(r183752)
+++ stable/7/sys/netinet/udp_usrreq.c	Fri Oct 10 21:18:12 2008	(r183753)
@@ -163,14 +163,6 @@ udp_inpcb_init(void *mem, int size, int 
 {
 	struct inpcb *inp;
 
-	TUNABLE_INT_FETCH("net.inet.udp.soreceive_dgram_enabled",
-	    &udp_soreceive_dgram);
-	if (udp_soreceive_dgram) {
-		udp_usrreqs.pru_soreceive = soreceive_dgram;
-#ifdef INET6
-		udp6_usrreqs.pru_soreceive = soreceive_dgram;
-#endif
-	}
 	inp = mem;
 	INP_LOCK_INIT(inp, "inp", "udpinp");
 	return (0);
@@ -192,6 +184,14 @@ udp_init(void)
 	uma_zone_set_max(udbinfo.ipi_zone, maxsockets);
 	EVENTHANDLER_REGISTER(maxsockets_change, udp_zone_change, NULL,
 	    EVENTHANDLER_PRI_ANY);
+	TUNABLE_INT_FETCH("net.inet.udp.soreceive_dgram_enabled",
+	    &udp_soreceive_dgram);
+	if (udp_soreceive_dgram) {
+		udp_usrreqs.pru_soreceive = soreceive_dgram;
+#ifdef INET6
+		udp6_usrreqs.pru_soreceive = soreceive_dgram;
+#endif
+	}
 }
 
 /*