Merge branch 'next/timer' of git://git.linaro.org/people/arnd/arm-soc

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / rtlwifi / base.c

diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c
index 098fc557a88d2a5f2d93639c15ed57bfd1038c58..d4fdd2a5a7392a24f1a15b47f3f5aaa14d36a7cc 100644 (file)
--- 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)
            IEEE80211_HW_RX_INCLUDES_FCS |
            IEEE80211_HW_BEACON_FILTER |
            IEEE80211_HW_AMPDU_AGGREGATION |
+           IEEE80211_HW_CONNECTION_MONITOR |
+           /* IEEE80211_HW_SUPPORTS_CQM_RSSI | */
            IEEE80211_HW_REPORTS_TX_ACK_STATUS | 0;
 
        /* 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,
                 *So tcb_desc->hw_rate is just used for
                 *special data and mgt frames
                 */
-               if (info->control.rates[0].idx == 0 &&
+               if (info->control.rates[0].idx == 0 ||
                                ieee80211_is_nullfunc(fc)) {
                        tcb_desc->use_driver_rate = true;
                        tcb_desc->ratr_index = RATR_INX_WIRELESS_MC;
@@ -1138,7 +1140,7 @@ void rtl_watchdog_wq_callback(void *data)
        }
 
        /*
-        *<3> to check if traffic busy, if
+        *<2> to check if traffic busy, if
         * busytraffic we don't change channel
         */
        if (mac->link_state >= MAC80211_LINKED) {