diff options
author | David S. Miller <davem@davemloft.net> | 2008-07-15 06:34:57 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-17 22:21:12 -0400 |
commit | 51cb6db0f5654f08a4a6bfa3888dc36a51c2df3e (patch) | |
tree | b9103a34674efeca9ffa2f9ef9cec1ee9735ab9d /include/net | |
parent | eae792b722fef08dcf3aee88266ee7def9710757 (diff) |
mac80211: Reimplement WME using ->select_queue().
The only behavior change is that we do not drop packets under any
circumstances. If that is absolutely needed, we could easily add it
back.
With cleanups and help from Johannes Berg.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/mac80211.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 24a69f6075c2..4dd3d93e1960 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
@@ -847,20 +847,12 @@ static inline void SET_IEEE80211_PERM_ADDR(struct ieee80211_hw *hw, u8 *addr) | |||
847 | 847 | ||
848 | static inline int ieee80211_num_regular_queues(struct ieee80211_hw *hw) | 848 | static inline int ieee80211_num_regular_queues(struct ieee80211_hw *hw) |
849 | { | 849 | { |
850 | #ifdef CONFIG_MAC80211_QOS | ||
851 | return hw->queues; | 850 | return hw->queues; |
852 | #else | ||
853 | return 1; | ||
854 | #endif | ||
855 | } | 851 | } |
856 | 852 | ||
857 | static inline int ieee80211_num_queues(struct ieee80211_hw *hw) | 853 | static inline int ieee80211_num_queues(struct ieee80211_hw *hw) |
858 | { | 854 | { |
859 | #ifdef CONFIG_MAC80211_QOS | ||
860 | return hw->queues + hw->ampdu_queues; | 855 | return hw->queues + hw->ampdu_queues; |
861 | #else | ||
862 | return 1; | ||
863 | #endif | ||
864 | } | 856 | } |
865 | 857 | ||
866 | static inline struct ieee80211_rate * | 858 | static inline struct ieee80211_rate * |