From owner-svn-src-head@FreeBSD.ORG  Mon Aug 26 00:28:57 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id AA145FE;
 Mon, 26 Aug 2013 00:28:57 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 976D92BDC;
 Mon, 26 Aug 2013 00:28:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7Q0Svug054478;
 Mon, 26 Aug 2013 00:28:57 GMT (envelope-from markj@svn.freebsd.org)
Received: (from markj@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7Q0SvoI054477;
 Mon, 26 Aug 2013 00:28:57 GMT (envelope-from markj@svn.freebsd.org)
Message-Id: <201308260028.r7Q0SvoI054477@svn.freebsd.org>
From: Mark Johnston <markj@FreeBSD.org>
Date: Mon, 26 Aug 2013 00:28:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r254893 - head/sys/netinet
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Aug 2013 00:28:57 -0000

Author: markj
Date: Mon Aug 26 00:28:57 2013
New Revision: 254893
URL: http://svnweb.freebsd.org/changeset/base/254893

Log:
  The second last argument of udp:::receive is supposed to contain the
  connection state, not the IP header.
  
  X-MFC with:	r254889

Modified:
  head/sys/netinet/udp_usrreq.c

Modified: head/sys/netinet/udp_usrreq.c
==============================================================================
--- head/sys/netinet/udp_usrreq.c	Sun Aug 25 23:26:43 2013	(r254892)
+++ head/sys/netinet/udp_usrreq.c	Mon Aug 26 00:28:57 2013	(r254893)
@@ -620,7 +620,7 @@ udp_input(struct mbuf *m, int off)
 		return;
 	}
 
-	UDP_PROBE(receive, NULL, inp, ip, ip, uh);
+	UDP_PROBE(receive, NULL, inp, ip, inp, uh);
 	udp_append(inp, ip, m, iphlen, &udp_in);
 	INP_RUNLOCK(inp);
 	return;