diff options
author | Chaoming Li <chaoming_li@realsil.com.cn> | 2011-10-11 22:28:48 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-10-14 14:48:15 -0400 |
commit | 09e92f0be2cc14dc808de0c0f12b57981b8c027d (patch) | |
tree | 89024ddca150be4ca8b14dfa3994585336a15677 /drivers | |
parent | 603be3885b9d518ff4822b357e2687b6ff02f1ac (diff) |
rtlwifi: Update to new Realtek version - Part I
This patch incorporate the differences between the 06/20/2011 and
08/16/2011 Realtek releases of the rtlwifi driver.
The changes include:
1. Handling of IEEE80211_HW_CONNECTION_MONITOR.
2. Fix typo to get proper response to nullfunc frames.
Signed-off-by: Chaoming Li <chaoming_li@realsil.com.cn>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/rtlwifi/base.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c index 098fc557a88..d4fdd2a5a73 100644 --- a/drivers/net/wireless/rtlwifi/base.c +++ b/drivers/net/wireless/rtlwifi/base.c | |||
@@ -311,6 +311,8 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw) | |||
311 | IEEE80211_HW_RX_INCLUDES_FCS | | 311 | IEEE80211_HW_RX_INCLUDES_FCS | |
312 | IEEE80211_HW_BEACON_FILTER | | 312 | IEEE80211_HW_BEACON_FILTER | |
313 | IEEE80211_HW_AMPDU_AGGREGATION | | 313 | IEEE80211_HW_AMPDU_AGGREGATION | |
314 | IEEE80211_HW_CONNECTION_MONITOR | | ||
315 | /* IEEE80211_HW_SUPPORTS_CQM_RSSI | */ | ||
314 | IEEE80211_HW_REPORTS_TX_ACK_STATUS | 0; | 316 | IEEE80211_HW_REPORTS_TX_ACK_STATUS | 0; |
315 | 317 | ||
316 | /* swlps or hwlps has been set in diff chip in init_sw_vars */ | 318 | /* swlps or hwlps has been set in diff chip in init_sw_vars */ |
@@ -850,7 +852,7 @@ void rtl_get_tcb_desc(struct ieee80211_hw *hw, | |||
850 | *So tcb_desc->hw_rate is just used for | 852 | *So tcb_desc->hw_rate is just used for |
851 | *special data and mgt frames | 853 | *special data and mgt frames |
852 | */ | 854 | */ |
853 | if (info->control.rates[0].idx == 0 && | 855 | if (info->control.rates[0].idx == 0 || |
854 | ieee80211_is_nullfunc(fc)) { | 856 | ieee80211_is_nullfunc(fc)) { |
855 | tcb_desc->use_driver_rate = true; | 857 | tcb_desc->use_driver_rate = true; |
856 | tcb_desc->ratr_index = RATR_INX_WIRELESS_MC; | 858 | tcb_desc->ratr_index = RATR_INX_WIRELESS_MC; |
@@ -1138,7 +1140,7 @@ void rtl_watchdog_wq_callback(void *data) | |||
1138 | } | 1140 | } |
1139 | 1141 | ||
1140 | /* | 1142 | /* |
1141 | *<3> to check if traffic busy, if | 1143 | *<2> to check if traffic busy, if |
1142 | * busytraffic we don't change channel | 1144 | * busytraffic we don't change channel |
1143 | */ | 1145 | */ |
1144 | if (mac->link_state >= MAC80211_LINKED) { | 1146 | if (mac->link_state >= MAC80211_LINKED) { |