Author: adrian
Date: Mon May 13 19:03:12 2013
New Revision: 250609
URL: http://svnweb.freebsd.org/changeset/base/250609
Log:
Since the node state is 100% back under the TX lock, just kill the use
of atomics.
I'll re-think this nonsense later.
Modified:
head/sys/dev/ath/if_ath.c
head/sys/dev/ath/if_athvar.h
Modified: head/sys/dev/ath/if_ath.c
==============================================================================
--- head/sys/dev/ath/if_ath.c Mon May 13 19:02:22 2013 (r250608)
+++ head/sys/dev/ath/if_ath.c Mon May 13 19:03:12 2013 (r250609)
@@ -6028,7 +6028,7 @@ ath_node_set_tim(struct ieee80211_node *
an->an_tim_set = 1;
ATH_TX_UNLOCK(sc);
changed = avp->av_set_tim(ni, enable);
- } else if (atomic_load_acq_int(&an->an_swq_depth) == 0) {
+ } else if (an->an_swq_depth == 0) {
/* disable */
DPRINTF(sc, ATH_DEBUG_NODE_PWRSAVE,
"%s: an=%p, enable=%d, an_swq_depth == 0, disabling\n",
@@ -6120,16 +6120,9 @@ ath_tx_update_tim(struct ath_softc *sc,
ATH_TX_LOCK_ASSERT(sc);
if (enable) {
- /*
- * Don't bother grabbing the lock unless the queue is not
- * empty.
- */
- if (atomic_load_acq_int(&an->an_swq_depth) == 0)
- return;
-
if (an->an_is_powersave &&
an->an_tim_set == 0 &&
- atomic_load_acq_int(&an->an_swq_depth) != 0) {
+ an->an_swq_depth != 0) {
DPRINTF(sc, ATH_DEBUG_NODE_PWRSAVE,
"%s: an=%p, swq_depth>0, tim_set=0, set!\n",
__func__, an);
@@ -6140,13 +6133,13 @@ ath_tx_update_tim(struct ath_softc *sc,
/*
* Don't bother grabbing the lock unless the queue is empty.
*/
- if (atomic_load_acq_int(&an->an_swq_depth) != 0)
+ if (&an->an_swq_depth != 0)
return;
if (an->an_is_powersave &&
an->an_stack_psq == 0 &&
an->an_tim_set == 1 &&
- atomic_load_acq_int(&an->an_swq_depth) == 0) {
+ an->an_swq_depth == 0) {
DPRINTF(sc, ATH_DEBUG_NODE_PWRSAVE,
"%s: an=%p, swq_depth=0, tim_set=1, psq_set=0,"
" clear!\n",
Modified: head/sys/dev/ath/if_athvar.h
==============================================================================
--- head/sys/dev/ath/if_athvar.h Mon May 13 19:02:22 2013
(r250608)
+++ head/sys/dev/ath/if_athvar.h Mon May 13 19:03:12 2013
(r250609)
@@ -415,17 +415,17 @@ struct ath_txq {
#define ATH_TID_INSERT_HEAD(_tq, _elm, _field) do { \
TAILQ_INSERT_HEAD(&(_tq)->tid_q, (_elm), _field); \
(_tq)->axq_depth++; \
- atomic_add_rel_32( &((_tq)->an)->an_swq_depth, 1); \
+ (_tq)->an->an_swq_depth++; \
} while (0)
#define ATH_TID_INSERT_TAIL(_tq, _elm, _field) do { \
TAILQ_INSERT_TAIL(&(_tq)->tid_q, (_elm), _field); \
(_tq)->axq_depth++; \
- atomic_add_rel_32( &((_tq)->an)->an_swq_depth, 1); \
+ (_tq)->an->an_swq_depth++; \
} while (0)
#define ATH_TID_REMOVE(_tq, _elm, _field) do { \
TAILQ_REMOVE(&(_tq)->tid_q, _elm, _field); \
(_tq)->axq_depth--; \
- atomic_subtract_rel_32( &((_tq)->an)->an_swq_depth, 1); \
+ (_tq)->an->an_swq_depth--; \
} while (0)
#define ATH_TID_FIRST(_tq) TAILQ_FIRST(&(_tq)->tid_q)
#define ATH_TID_LAST(_tq, _field) TAILQ_LAST(&(_tq)->tid_q,
_field)
@@ -436,17 +436,17 @@ struct ath_txq {
#define ATH_TID_FILT_INSERT_HEAD(_tq, _elm, _field) do { \
TAILQ_INSERT_HEAD(&(_tq)->filtq.tid_q, (_elm), _field); \
(_tq)->axq_depth++; \
- atomic_add_rel_32( &((_tq)->an)->an_swq_depth, 1); \
+ (_tq)->an->an_swq_depth++; \
} while (0)
#define ATH_TID_FILT_INSERT_TAIL(_tq, _elm, _field) do { \
TAILQ_INSERT_TAIL(&(_tq)->filtq.tid_q, (_elm), _field); \
(_tq)->axq_depth++; \
- atomic_add_rel_32( &((_tq)->an)->an_swq_depth, 1); \
+ (_tq)->an->an_swq_depth++; \
} while (0)
#define ATH_TID_FILT_REMOVE(_tq, _elm, _field) do { \
TAILQ_REMOVE(&(_tq)->filtq.tid_q, _elm, _field); \
(_tq)->axq_depth--; \
- atomic_subtract_rel_32( &((_tq)->an)->an_swq_depth, 1); \
+ (_tq)->an->an_swq_depth--; \
} while (0)
#define ATH_TID_FILT_FIRST(_tq) TAILQ_FIRST(&(_tq)->filtq.tid_q)
#define ATH_TID_FILT_LAST(_tq, _field)
TAILQ_LAST(&(_tq)->filtq.tid_q,_field)
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
