From owner-svn-src-all@FreeBSD.ORG  Fri Feb  6 12:20:09 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 04D52106564A;
	Fri,  6 Feb 2009 12:20:09 +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 E610A8FC1C;
	Fri,  6 Feb 2009 12:20:08 +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 n16CK8XJ060902;
	Fri, 6 Feb 2009 12:20:08 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n16CK8og060901;
	Fri, 6 Feb 2009 12:20:08 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200902061220.n16CK8og060901@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Fri, 6 Feb 2009 12:20:08 +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: r188226 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb netipx
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Feb 2009 12:20:09 -0000

Author: rwatson
Date: Fri Feb  6 12:20:08 2009
New Revision: 188226
URL: http://svn.freebsd.org/changeset/base/188226

Log:
  Merge r185928 from head to stable/7:
  
    Add missing "goto set_head" for SO_IPX_CHECKSUM; otherwise we fall through
    to the SO_HEADERS_ON_OUTPUT case and set that instead.
  
    Found with:   Coverity Prevent(tm)
    Coverity ID:  3988

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/netipx/ipx_usrreq.c

Modified: stable/7/sys/netipx/ipx_usrreq.c
==============================================================================
--- stable/7/sys/netipx/ipx_usrreq.c	Fri Feb  6 12:14:57 2009	(r188225)
+++ stable/7/sys/netipx/ipx_usrreq.c	Fri Feb  6 12:20:08 2009	(r188226)
@@ -412,6 +412,7 @@ ipx_ctloutput(struct socket *so, struct 
 
 		case SO_IPX_CHECKSUM:
 			mask = IPXP_CHECKSUM;
+			goto set_head;
 
 		case SO_HEADERS_ON_OUTPUT:
 			mask = IPXP_RAWOUT;