From owner-p4-projects@FreeBSD.ORG  Sun Aug  7 14:49:14 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7664216A421; Sun,  7 Aug 2005 14:49:13 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 4E88A16A41F
	for <perforce@freebsd.org>; Sun,  7 Aug 2005 14:49:13 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 42DE443D7D
	for <perforce@freebsd.org>; Sun,  7 Aug 2005 14:49:08 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j77En8Tp093638
	for <perforce@freebsd.org>; Sun, 7 Aug 2005 14:49:08 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j77En7WK093635
	for perforce@freebsd.org; Sun, 7 Aug 2005 14:49:07 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 7 Aug 2005 14:49:07 GMT
Message-Id: <200508071449.j77En7WK093635@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 81600 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Aug 2005 14:49:14 -0000

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

Change 81600 by rwatson@rwatson_peppercorn on 2005/08/07 14:48:20

	Catch up with if_pcn driver changes.

Affected files ...

.. //depot/projects/netsmp/src/sys/pci/if_pcn.c#6 edit

Differences ...

==== //depot/projects/netsmp/src/sys/pci/if_pcn.c#6 (text+ko) ====

@@ -927,7 +927,7 @@
 	sc = xsc;
 	ifp = sc->pcn_ifp;
 	PCN_LOCK(sc);
-	if (!(ifp->if_flags & IFF_RUNNING)) {
+	if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) {
 		PCN_UNLOCK(sc);
 		return;
 	}
@@ -1087,7 +1087,7 @@
 
 	idx = sc->pcn_cdata.pcn_tx_prod;
 
-	if (ifp->if_drv_flags & IFF_DRV_OACTIVE) {
+	if (ifp->if_drv_flags & IFF_DRV_OACTIVE)
 		return;
 
 	while(sc->pcn_cdata.pcn_tx_chain[idx] == NULL) {