aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/mac80211.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-09-08 05:05:09 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-09-11 15:53:34 -0400
commitfe3fa827314b877486c515a001c3e6f604f6f16f (patch)
tree64b04c2ee021bf8428bc2f5e9370459bf0ae9459 /include/net/mac80211.h
parent69e6c010fd5f5015d3cc64718fbe266face93770 (diff)
mac80211: make conf_tx non-atomic
The conf_tx callback currently needs to be atomic, this requirement is just because it can be called from scanning. This rearranges it slightly to only update while not scanning (which is fine, we'll be getting beacons when associated) and thus removes the atomic requirement. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net/mac80211.h')
-rw-r--r--include/net/mac80211.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 7c399a9c11da..fb9e62211c34 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1142,7 +1142,7 @@ enum ieee80211_ampdu_mlme_action {
1142 * of assocaited station or AP. 1142 * of assocaited station or AP.
1143 * 1143 *
1144 * @conf_tx: Configure TX queue parameters (EDCF (aifs, cw_min, cw_max), 1144 * @conf_tx: Configure TX queue parameters (EDCF (aifs, cw_min, cw_max),
1145 * bursting) for a hardware TX queue. Must be atomic. 1145 * bursting) for a hardware TX queue.
1146 * 1146 *
1147 * @get_tx_stats: Get statistics of the current TX queue status. This is used 1147 * @get_tx_stats: Get statistics of the current TX queue status. This is used
1148 * to get number of currently queued packets (queue length), maximum queue 1148 * to get number of currently queued packets (queue length), maximum queue