Browse Source

ath9k: make the driver specific rate control module optional

ath9k can use minstrel_ht instead, so it makes sense to save some space here.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Felix Fietkau 14 years ago
parent
commit
6e5c2b4e8a

+ 8 - 0
drivers/net/wireless/ath/ath9k/Kconfig

@@ -32,6 +32,14 @@ config ATH9K_DEBUGFS
 
 
 	  Also required for changing debug message flags at run time.
 	  Also required for changing debug message flags at run time.
 
 
+config ATH9K_RATE_CONTROL
+	bool "Atheros ath9k rate control"
+	depends on ATH9K
+	default y
+	---help---
+	  Say Y, if you want to use the ath9k specific rate control
+	  module instead of minstrel_ht.
+
 config ATH9K_HTC
 config ATH9K_HTC
        tristate "Atheros HTC based wireless cards support"
        tristate "Atheros HTC based wireless cards support"
        depends on USB && MAC80211
        depends on USB && MAC80211

+ 1 - 1
drivers/net/wireless/ath/ath9k/Makefile

@@ -5,8 +5,8 @@ ath9k-y +=	beacon.o \
 		recv.o \
 		recv.o \
 		xmit.o \
 		xmit.o \
 		virtual.o \
 		virtual.o \
-		rc.o
 
 
+ath9k-$(CONFIG_ATH9K_RATE_CONTROL) += rc.o
 ath9k-$(CONFIG_PCI) += pci.o
 ath9k-$(CONFIG_PCI) += pci.o
 ath9k-$(CONFIG_ATHEROS_AR71XX) += ahb.o
 ath9k-$(CONFIG_ATHEROS_AR71XX) += ahb.o
 ath9k-$(CONFIG_ATH9K_DEBUGFS) += debug.o
 ath9k-$(CONFIG_ATH9K_DEBUGFS) += debug.o

+ 2 - 0
drivers/net/wireless/ath/ath9k/init.c

@@ -654,7 +654,9 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
 	hw->sta_data_size = sizeof(struct ath_node);
 	hw->sta_data_size = sizeof(struct ath_node);
 	hw->vif_data_size = sizeof(struct ath_vif);
 	hw->vif_data_size = sizeof(struct ath_vif);
 
 
+#ifdef CONFIG_ATH9K_RATE_CONTROL
 	hw->rate_control_algorithm = "ath9k_rate_control";
 	hw->rate_control_algorithm = "ath9k_rate_control";
+#endif
 
 
 	if (test_bit(ATH9K_MODE_11G, sc->sc_ah->caps.wireless_modes))
 	if (test_bit(ATH9K_MODE_11G, sc->sc_ah->caps.wireless_modes))
 		hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
 		hw->wiphy->bands[IEEE80211_BAND_2GHZ] =

+ 11 - 0
drivers/net/wireless/ath/ath9k/rc.h

@@ -224,7 +224,18 @@ enum ath9k_internal_frame_type {
 	ATH9K_IFT_UNPAUSE
 	ATH9K_IFT_UNPAUSE
 };
 };
 
 
+#ifdef CONFIG_ATH9K_RATE_CONTROL
 int ath_rate_control_register(void);
 int ath_rate_control_register(void);
 void ath_rate_control_unregister(void);
 void ath_rate_control_unregister(void);
+#else
+static inline int ath_rate_control_register(void)
+{
+	return 0;
+}
+
+static inline void ath_rate_control_unregister(void)
+{
+}
+#endif
 
 
 #endif /* RC_H */
 #endif /* RC_H */