Author: adrian
Date: Tue Sep 29 03:37:17 2015
New Revision: 288349
URL: https://svnweb.freebsd.org/changeset/base/288349
Log:
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.
Modified:
head/sys/dev/ath/if_ath_ahb.c
head/sys/dev/ath/if_ath_pci.c
head/sys/dev/ath/if_athvar.h
Modified: head/sys/dev/ath/if_ath_ahb.c
==============================================================================
--- head/sys/dev/ath/if_ath_ahb.c Mon Sep 28 20:54:18 2015
(r288348)
+++ head/sys/dev/ath/if_ath_ahb.c Tue Sep 29 03:37:17 2015
(r288349)
@@ -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);
Modified: head/sys/dev/ath/if_ath_pci.c
==============================================================================
--- head/sys/dev/ath/if_ath_pci.c Mon Sep 28 20:54:18 2015
(r288348)
+++ head/sys/dev/ath/if_ath_pci.c Tue Sep 29 03:37:17 2015
(r288349)
@@ -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);
Modified: head/sys/dev/ath/if_athvar.h
==============================================================================
--- head/sys/dev/ath/if_athvar.h Mon Sep 28 20:54:18 2015
(r288348)
+++ head/sys/dev/ath/if_athvar.h Tue Sep 29 03:37:17 2015
(r288349)
@@ -941,26 +941,6 @@ struct ath_softc {
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
* doesn't require this, this may change in the future.
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
