diff options
Diffstat (limited to 'drivers/net/wireless/rtlwifi/base.c')
-rw-r--r-- | drivers/net/wireless/rtlwifi/base.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c index 3f40dc2b129c..bb0c781f4a1b 100644 --- a/drivers/net/wireless/rtlwifi/base.c +++ b/drivers/net/wireless/rtlwifi/base.c | |||
@@ -283,13 +283,7 @@ int rtl_init_core(struct ieee80211_hw *hw) | |||
283 | rtlmac->hw = hw; | 283 | rtlmac->hw = hw; |
284 | 284 | ||
285 | /* <2> rate control register */ | 285 | /* <2> rate control register */ |
286 | if (rtl_rate_control_register()) { | 286 | hw->rate_control_algorithm = "rtl_rc"; |
287 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, | ||
288 | ("rtl: Unable to register rtl_rc," | ||
289 | "use default RC !!\n")); | ||
290 | } else { | ||
291 | hw->rate_control_algorithm = "rtl_rc"; | ||
292 | } | ||
293 | 287 | ||
294 | /* | 288 | /* |
295 | * <3> init CRDA must come after init | 289 | * <3> init CRDA must come after init |
@@ -325,8 +319,6 @@ int rtl_init_core(struct ieee80211_hw *hw) | |||
325 | 319 | ||
326 | void rtl_deinit_core(struct ieee80211_hw *hw) | 320 | void rtl_deinit_core(struct ieee80211_hw *hw) |
327 | { | 321 | { |
328 | /*RC*/ | ||
329 | rtl_rate_control_unregister(); | ||
330 | } | 322 | } |
331 | 323 | ||
332 | void rtl_init_rx_config(struct ieee80211_hw *hw) | 324 | void rtl_init_rx_config(struct ieee80211_hw *hw) |
@@ -945,11 +937,16 @@ MODULE_DESCRIPTION("Realtek 802.11n PCI wireless core"); | |||
945 | 937 | ||
946 | static int __init rtl_core_module_init(void) | 938 | static int __init rtl_core_module_init(void) |
947 | { | 939 | { |
940 | if (rtl_rate_control_register()) | ||
941 | printk(KERN_ERR "rtlwifi: Unable to register rtl_rc," | ||
942 | "use default RC !!\n"); | ||
948 | return 0; | 943 | return 0; |
949 | } | 944 | } |
950 | 945 | ||
951 | static void __exit rtl_core_module_exit(void) | 946 | static void __exit rtl_core_module_exit(void) |
952 | { | 947 | { |
948 | /*RC*/ | ||
949 | rtl_rate_control_unregister(); | ||
953 | } | 950 | } |
954 | 951 | ||
955 | module_init(rtl_core_module_init); | 952 | module_init(rtl_core_module_init); |