PERFORCE change 134960 for review

Kip Macy kmacy at FreeBSD.org
Wed Feb 6 21:31:01 PST 2008


http://perforce.freebsd.org/chv.cgi?CH=134960

Change 134960 by kmacy at kmacy:storage:toehead on 2008/02/07 05:30:54

	don't unconditionally reference uio as it may not be set for kernel sockets

Affected files ...

.. //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#17 edit

Differences ...

==== //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#17 (text+ko) ====

@@ -517,7 +517,7 @@
 		zcopy_thres = TOM_TUNABLE(tdev, zcopy_sosend_partial_thres);
 		zcopy_enabled = TOM_TUNABLE(tdev, zcopy_sosend_enabled);
 
-		if ((uio->uio_resid > zcopy_thres) &&
+		if (uio && (uio->uio_resid > zcopy_thres) &&
 		    (uio->uio_iovcnt < TMP_IOV_MAX) &&  ((so->so_state & SS_NBIO) == 0)
 		    && zcopy_enabled) {
 			rv = t3_sosend(so, uio);
@@ -924,7 +924,7 @@
 	 *
 	 */
 	
-	if ((tp->t_flags & TF_TOE) && ((flags & (MSG_WAITALL|MSG_OOB|MSG_PEEK|MSG_DONTWAIT)) == 0)
+	if ((tp->t_flags & TF_TOE) && uio && ((flags & (MSG_WAITALL|MSG_OOB|MSG_PEEK|MSG_DONTWAIT)) == 0)
 	    && (uio->uio_iovcnt == 1) && (mp0 == NULL)) {
 		tdev =  TOE_DEV(so);
 		zcopy_thres = TOM_TUNABLE(tdev, ddp_thres);
@@ -938,7 +938,7 @@
 			else
 				printf("returned EAGAIN\n");
 		} 
-	} else if (tp->t_flags & TF_TOE)
+	} else if ((tp->t_flags & TF_TOE) && uio)
 		printf("skipping t3_soreceive flags=0x%x iovcnt=%d mp0=%p sb_state=0x%x\n",
 		    flags, uio->uio_iovcnt, mp0, so->so_rcv.sb_state);
 	return pru_soreceive(so, psa, uio, mp0, controlp, flagsp);


More information about the p4-projects mailing list