From owner-cvs-all@FreeBSD.ORG Mon Aug 18 23:01:24 2008 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BF9F71065703; Mon, 18 Aug 2008 23:01:24 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A1B098FC21; Mon, 18 Aug 2008 23:01:24 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7IN1Ome058519; Mon, 18 Aug 2008 23:01:24 GMT (envelope-from bz@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7IN1OCp058518; Mon, 18 Aug 2008 23:01:24 GMT (envelope-from bz@repoman.freebsd.org) Message-Id: <200808182301.m7IN1OCp058518@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to bz@repoman.freebsd.org using -f From: "Bjoern A. Zeeb" Date: Mon, 18 Aug 2008 23:00:41 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_7 Cc: Subject: cvs commit: src/sys/netinet udp_usrreq.c src/sys/netinet6 ip6_input.c ip6_var.h X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Aug 2008 23:01:24 -0000 bz 2008-08-18 23:00:41 UTC FreeBSD src repository Modified files: (Branch: RELENG_7) sys/netinet udp_usrreq.c sys/netinet6 ip6_input.c ip6_var.h Log: SVN rev 181856 on 2008-08-18 23:00:41Z by bz MFC: r181782, cvs 1.235 udp_usrreq.c, 1.102 ip6_input.c, 1.44 ip6_var.h Fix a regression introduced in r179289 splitting up ip6_savecontrol() into v4-only vs. v6-only inp_flags processing. When ip6_savecontrol_v4() is called from ip6_savecontrol() we were not passing back the **mp thus the information will be missing in userland. Istead of going with a *** as suggested in the PR we are returning **mp now and passing in the v4only flag as a pointer argument. PR: kern/126349 Revision Changes Path 1.218.2.3 +1 -1 src/sys/netinet/udp_usrreq.c 1.95.2.2 +14 -6 src/sys/netinet6/ip6_input.c 1.39.2.4 +2 -1 src/sys/netinet6/ip6_var.h