PERFORCE change 135303 for review

[Sepherosa Ziehau]

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

Change 135303 by sephe at 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;
 }