From owner-p4-projects@FreeBSD.ORG  Wed Feb 13 11:34:17 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B438D16A479; Wed, 13 Feb 2008 11:34:17 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 60EF316A41B
	for <perforce@FreeBSD.org>; Wed, 13 Feb 2008 11:34:17 +0000 (UTC)
	(envelope-from sephe@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5490C13C4DD
	for <perforce@FreeBSD.org>; Wed, 13 Feb 2008 11:34:17 +0000 (UTC)
	(envelope-from sephe@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1DBYHKD059625
	for <perforce@FreeBSD.org>; Wed, 13 Feb 2008 11:34:17 GMT
	(envelope-from sephe@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1DBYH8X059622
	for perforce@freebsd.org; Wed, 13 Feb 2008 11:34:17 GMT
	(envelope-from sephe@FreeBSD.org)
Date: Wed, 13 Feb 2008 11:34:17 GMT
Message-Id: <200802131134.m1DBYH8X059622@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sephe@FreeBSD.org using -f
From: Sepherosa Ziehau <sephe@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 135303 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: Wed, 13 Feb 2008 11:34:18 -0000

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

Change 135303 by sephe@sephe_zealot:sam_wifi on 2008/02/13 11:34:10

	if_timer's usage in dfly (old 802.11 semantic) is different from
	freebsd's after latest 802.11 overhaul in freebsd

Affected files ...

.. //depot/projects/wifi/sys/dev/bwi/if_bwi.c#14 edit

Differences ...

==== //depot/projects/wifi/sys/dev/bwi/if_bwi.c#14 (text+ko) ====

@@ -1392,8 +1392,7 @@
 	tbd->tbd_idx = idx;
 
 	if (trans)
-		sc->sc_tx_timer = 5;
-	ifp->if_timer = 1;
+		ifp->if_timer = 5;
 	BWI_UNLOCK(sc);
 }
 
@@ -1403,15 +1402,10 @@
 	struct bwi_softc *sc = ifp->if_softc;
 
 	BWI_LOCK(sc);
-	ifp->if_timer = 0;
-	if ((ifp->if_drv_flags & IFF_DRV_RUNNING) && sc->sc_tx_timer) {
-		if (--sc->sc_tx_timer == 0) {
-			if_printf(ifp, "watchdog timeout\n");
-			ifp->if_oerrors++;
-			/* TODO */
-		} else {
-			ifp->if_timer = 1;
-		}
+	if ((ifp->if_drv_flags & IFF_DRV_RUNNING)) {
+		if_printf(ifp, "watchdog timeout\n");
+		ifp->if_oerrors++;
+		/* TODO */
 	}
 	BWI_UNLOCK(sc);
 }
@@ -3175,7 +3169,7 @@
 	tb->tb_mbuf = NULL;
 
 	if (tbd->tbd_used == 0)
-		sc->sc_tx_timer = 0;
+		ifp->if_timer = 0;
 
 	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 }