X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fnet%2Fmac80211.h;h=4dd3d93e196025d162217a0d6107a28733ac7af9;hb=eb6a12c2428d21a9f3e0f1a50e927d5fd80fc3d0;hp=24a69f6075c2273471e0240ae45e4e9b12f3fcd5;hpb=925068dcdc746236264d1877d3d5df656e87882a;p=linux-2.6

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 24a69f6075..4dd3d93e19 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)
 
 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 *