Remove the references to the TX IC lock - i ended up solving this

using net80211 to seralise encap+xmit, so now it's a non-issue.

diff --git a/sys/dev/ath/if_ath_ahb.c b/sys/dev/ath/if_ath_ahb.c
index fe6420c09c014aa6a5b63177dba551b2e0d324a6..0b546a069b8b689eb19b23d80822046d2030765c 100644 (file)
--- a/sys/dev/ath/if_ath_ahb.c
+++ b/sys/dev/ath/if_ath_ahb.c
@@ -261,7 +261,6 @@ ath_ahb_attach(device_t dev)
        ATH_PCU_LOCK_INIT(sc);
        ATH_RX_LOCK_INIT(sc);
        ATH_TX_LOCK_INIT(sc);
-       ATH_TX_IC_LOCK_INIT(sc);
        ATH_TXSTATUS_LOCK_INIT(sc);
 
        error = ath_attach(device_id, sc);
@@ -271,7 +270,6 @@ ath_ahb_attach(device_t dev)
        ATH_TXSTATUS_LOCK_DESTROY(sc);
        ATH_RX_LOCK_DESTROY(sc);
        ATH_TX_LOCK_DESTROY(sc);
-       ATH_TX_IC_LOCK_DESTROY(sc);
        ATH_PCU_LOCK_DESTROY(sc);
        ATH_LOCK_DESTROY(sc);
        bus_dma_tag_destroy(sc->sc_dmat);
@@ -315,7 +313,6 @@ ath_ahb_detach(device_t dev)
        ATH_TXSTATUS_LOCK_DESTROY(sc);
        ATH_RX_LOCK_DESTROY(sc);
        ATH_TX_LOCK_DESTROY(sc);
-       ATH_TX_IC_LOCK_DESTROY(sc);
        ATH_PCU_LOCK_DESTROY(sc);
        ATH_LOCK_DESTROY(sc);
 

diff --git a/sys/dev/ath/if_ath_pci.c b/sys/dev/ath/if_ath_pci.c
index 5610882f315dbbb11a688adb21b0d47fb6ee51ef..bc4f7f0229b7e1df3bc32647f8d0a6154b66b0bc 100644 (file)
--- a/sys/dev/ath/if_ath_pci.c
+++ b/sys/dev/ath/if_ath_pci.c
@@ -283,7 +283,6 @@ ath_pci_attach(device_t dev)
        ATH_PCU_LOCK_INIT(sc);
        ATH_RX_LOCK_INIT(sc);
        ATH_TX_LOCK_INIT(sc);
-       ATH_TX_IC_LOCK_INIT(sc);
        ATH_TXSTATUS_LOCK_INIT(sc);
 
        /*
@@ -371,7 +370,6 @@ bad1:
        ATH_TXSTATUS_LOCK_DESTROY(sc);
        ATH_PCU_LOCK_DESTROY(sc);
        ATH_RX_LOCK_DESTROY(sc);
-       ATH_TX_IC_LOCK_DESTROY(sc);
        ATH_TX_LOCK_DESTROY(sc);
        ATH_LOCK_DESTROY(sc);
 
@@ -408,7 +406,6 @@ ath_pci_detach(device_t dev)
        ATH_TXSTATUS_LOCK_DESTROY(sc);
        ATH_PCU_LOCK_DESTROY(sc);
        ATH_RX_LOCK_DESTROY(sc);
-       ATH_TX_IC_LOCK_DESTROY(sc);
        ATH_TX_LOCK_DESTROY(sc);
        ATH_LOCK_DESTROY(sc);
 

diff --git a/sys/dev/ath/if_athvar.h b/sys/dev/ath/if_athvar.h
index e25bc7ae1be7785b2c82fac43e832486a3738239..1af99aa9c334e5f8595367f9958bc074c0da0b76 100644 (file)
--- a/sys/dev/ath/if_athvar.h
+++ b/sys/dev/ath/if_athvar.h
@@ -940,26 +940,6 @@ struct ath_softc {
 #define        ATH_TX_TRYLOCK(_sc)     (mtx_owned(&(_sc)->sc_tx_mtx) != 0 &&   \
                                        mtx_trylock(&(_sc)->sc_tx_mtx))
 
-/*
- * The IC TX lock is non-reentrant and serialises packet queuing from
- * the upper layers.
- */
-#define        ATH_TX_IC_LOCK_INIT(_sc) do {\
-       snprintf((_sc)->sc_tx_ic_mtx_name,                              \
-           sizeof((_sc)->sc_tx_ic_mtx_name),                           \
-           "%s IC TX lock",                                            \
-           device_get_nameunit((_sc)->sc_dev));                        \
-       mtx_init(&(_sc)->sc_tx_ic_mtx, (_sc)->sc_tx_ic_mtx_name,        \
-                NULL, MTX_DEF);                                        \
-       } while (0)
-#define        ATH_TX_IC_LOCK_DESTROY(_sc)     mtx_destroy(&(_sc)->sc_tx_ic_mtx)
-#define        ATH_TX_IC_LOCK(_sc)             mtx_lock(&(_sc)->sc_tx_ic_mtx)
-#define        ATH_TX_IC_UNLOCK(_sc)           mtx_unlock(&(_sc)->sc_tx_ic_mtx)
-#define        ATH_TX_IC_LOCK_ASSERT(_sc)      mtx_assert(&(_sc)->sc_tx_ic_mtx,        \
-               MA_OWNED)
-#define        ATH_TX_IC_UNLOCK_ASSERT(_sc)    mtx_assert(&(_sc)->sc_tx_ic_mtx,        \
-               MA_NOTOWNED)
-
 /*
  * The PCU lock is non-recursive and should be treated as a spinlock.
  * Although currently the interrupt code is run in netisr context and