From owner-p4-projects  Mon Nov 25 11:41:41 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B1AC537B406; Mon, 25 Nov 2002 11:41:36 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4A99037B401
	for <perforce@freebsd.org>; Mon, 25 Nov 2002 11:41:36 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8F9E143E9C
	for <perforce@freebsd.org>; Mon, 25 Nov 2002 11:41:35 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAPJc5mV005734
	for <perforce@freebsd.org>; Mon, 25 Nov 2002 11:38:05 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAPJc5TQ005731
	for perforce@freebsd.org; Mon, 25 Nov 2002 11:38:05 -0800 (PST)
Date: Mon, 25 Nov 2002 11:38:05 -0800 (PST)
Message-Id: <200211251938.gAPJc5TQ005731@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 21496 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

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

Change 21496 by jhb@jhb_laptop on 2002/11/25 11:37:24

	IFC @21494.

Affected files ...

.. //depot/projects/smpng/sys/cam/scsi/scsi_target.c#6 integrate
.. //depot/projects/smpng/sys/pci/if_dc.c#24 integrate

Differences ...

==== //depot/projects/smpng/sys/cam/scsi/scsi_target.c#6 (text+ko) ====

@@ -26,28 +26,24 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.45 2002/11/22 22:55:51 njl Exp $
+ * $FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.46 2002/11/25 19:28:05 njl Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
-#include <sys/event.h>
 #include <sys/malloc.h>
 #include <sys/poll.h>
-#include <sys/selinfo.h>
-#include <sys/uio.h>
 #include <sys/vnode.h>
-#include <sys/queue.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/devicestat.h>
 
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
 #include <cam/cam_periph.h>
-#include <cam/cam_queue.h>
 #include <cam/cam_xpt_periph.h>
-#include <cam/cam_debug.h>
 #include <cam/scsi/scsi_targetio.h>
 
 /* Transaction information attached to each CCB sent by the user */

==== //depot/projects/smpng/sys/pci/if_dc.c#24 (text+ko) ====

@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/pci/if_dc.c,v 1.83 2002/11/14 23:49:08 sam Exp $
+ * $FreeBSD: src/sys/pci/if_dc.c,v 1.84 2002/11/25 19:28:01 luigi Exp $
  */
 
 /*
@@ -137,7 +137,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD: src/sys/pci/if_dc.c,v 1.83 2002/11/14 23:49:08 sam Exp $";
+  "$FreeBSD: src/sys/pci/if_dc.c,v 1.84 2002/11/25 19:28:01 luigi Exp $";
 #endif
 
 /*
@@ -3539,15 +3539,13 @@
 	switch(command) {
 	case SIOCSIFFLAGS:
 		if (ifp->if_flags & IFF_UP) {
-			if (ifp->if_flags & IFF_RUNNING &&
-			    ifp->if_flags & IFF_PROMISC &&
-			    !(sc->dc_if_flags & IFF_PROMISC)) {
-				dc_setfilt(sc);
-			} else if (ifp->if_flags & IFF_RUNNING &&
-			    !(ifp->if_flags & IFF_PROMISC) &&
-			    sc->dc_if_flags & IFF_PROMISC) {
-				dc_setfilt(sc);
-			} else if (!(ifp->if_flags & IFF_RUNNING)) {
+			int need_setfilt = (ifp->if_flags ^ sc->dc_if_flags) &
+				(IFF_PROMISC | IFF_ALLMULTI);
+
+			if (ifp->if_flags & IFF_RUNNING) {
+				if (need_setfilt)
+					dc_setfilt(sc);
+			} else {
 				sc->dc_txthresh = 0;
 				dc_init(sc);
 			}

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message