diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2008-05-17 00:57:14 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-05-22 03:48:14 +0200 |
| commit | e2530083609148a7835b54c431f6b8956407c1f6 (patch) | |
| tree | 8ed43347541444c7a72d2c79f550f69a93cad591 /include | |
| parent | mac80211: dont allow fragmentation and requeuing on A-MPDU queues (diff) | |
| download | linux-e2530083609148a7835b54c431f6b8956407c1f6.tar.xz linux-e2530083609148a7835b54c431f6b8956407c1f6.zip | |
mac80211: use multi-queue master netdevice
This patch updates mac80211 and drivers to be multi-queue aware and
use that instead of the internal queue mapping. Also does a number
of cleanups in various pieces of the code that fall out and reduces
internal mac80211 state size.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/mac80211.h | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 4df39eb9115f..c80e3be8f79e 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -293,7 +293,7 @@ struct ieee80211_tx_info { s8 tx_rate_idx; u8 antenna_sel_tx; - u8 queue; /* use skb_queue_mapping soon */ + /* 1 byte hole */ union { struct { @@ -802,6 +802,24 @@ static inline void SET_IEEE80211_PERM_ADDR(struct ieee80211_hw *hw, u8 *addr) memcpy(hw->wiphy->perm_addr, addr, ETH_ALEN); } +static inline int ieee80211_num_regular_queues(struct ieee80211_hw *hw) +{ +#ifdef CONFIG_MAC80211_QOS + return hw->queues; +#else + return 1; +#endif +} + +static inline int ieee80211_num_queues(struct ieee80211_hw *hw) +{ +#ifdef CONFIG_MAC80211_QOS + return hw->queues + hw->ampdu_queues; +#else + return 1; +#endif +} + static inline struct ieee80211_rate * ieee80211_get_tx_rate(const struct ieee80211_hw *hw, const struct ieee80211_tx_info *c) |