svn commit: r226776 - user/adrian/if_ath_tx/sys/dev/ath

[Adrian Chadd]

Author: adrian
Date: Wed Oct 26 02:22:54 2011
New Revision: 226776
URL: http://svn.freebsd.org/changeset/base/226776

Log:
  In preparation for merging more of this code into -HEAD, let's disable
  this sc_in_* counter handling and just tidy up the minimum needed to get
  this code into the tree.

Modified:
  user/adrian/if_ath_tx/sys/dev/ath/if_ath.c
  user/adrian/if_ath_tx/sys/dev/ath/if_athvar.h

Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath.c
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/if_ath.c	Wed Oct 26 02:11:28 2011	(r226775)
+++ user/adrian/if_ath_tx/sys/dev/ath/if_ath.c	Wed Oct 26 02:22:54 2011	(r226776)
@@ -1834,10 +1834,6 @@ ath_reset(struct ifnet *ifp, ATH_RESET_T
 
 	DPRINTF(sc, ATH_DEBUG_RESET, "%s: called\n", __func__);
 
-	ATH_LOCK(sc);
-	sc->sc_in_reset++;
-	ATH_UNLOCK(sc);
-
 	ath_hal_intrset(ah, 0);		/* disable interrupts */
 	ath_draintxq(sc, reset_type);	/* stop xmit side */
 	/*
@@ -1874,10 +1870,6 @@ ath_reset(struct ifnet *ifp, ATH_RESET_T
 	}
 	ath_hal_intrset(ah, sc->sc_imask);
 
-	ATH_LOCK(sc);
-	sc->sc_in_reset--;
-	ATH_UNLOCK(sc);
-
 	ath_start(ifp);			/* restart xmit */
 	return 0;
 }
@@ -5248,11 +5240,6 @@ ath_set_channel(struct ieee80211com *ic)
 	struct ifnet *ifp = ic->ic_ifp;
 	struct ath_softc *sc = ifp->if_softc;
 
-	/* This isn't strictly a reset, but we still have to drain */
-	ATH_LOCK(sc);
-	sc->sc_in_reset++;
-	ATH_UNLOCK(sc);
-
 	(void) ath_chan_set(sc, ic->ic_curchan);
 	/*
 	 * If we are returning to our bss channel then mark state
@@ -5262,10 +5249,6 @@ ath_set_channel(struct ieee80211com *ic)
 	 */
 	if (!sc->sc_scanning && ic->ic_curchan == ic->ic_bsschan)
 		sc->sc_syncbeacon = 1;
-
-	ATH_LOCK(sc);
-	sc->sc_in_reset--;
-	ATH_UNLOCK(sc);
 }
 
 /*

Modified: user/adrian/if_ath_tx/sys/dev/ath/if_athvar.h
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/if_athvar.h	Wed Oct 26 02:11:28 2011	(r226775)
+++ user/adrian/if_ath_tx/sys/dev/ath/if_athvar.h	Wed Oct 26 02:22:54 2011	(r226776)
@@ -434,11 +434,13 @@ struct ath_softc {
 	 */
 	uint32_t		sc_txq_active;	/* bitmap of active TXQs */
 	uint32_t		sc_kickpcu;	/* whether to kick the PCU */
+#if 0
 	uint32_t		sc_in_reset;	/* currently reset/chan change */
 	uint32_t		sc_in_rxtasklet;	/* currently in rx tasklet */
 	uint32_t		sc_in_rxproc;	/* currently in ath_rx_proc */
 	uint32_t		sc_in_txsend;	/* currently in ath_start / ath_raw_xmit */
 	uint32_t		sc_in_txproc;	/* currently in ath_tx_proc */
+#endif
 
 	u_int			sc_keymax;	/* size of key cache */
 	u_int8_t		sc_keymap[ATH_KEYBYTES];/* key use bit map */