svn commit: r188226 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb netipx

[Robert Watson]

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;