Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[cascardo/linux.git] / drivers / staging / rtl8192ee / base.c

diff --git a/drivers/staging/rtl8192ee/base.c b/drivers/staging/rtl8192ee/base.c
index 64ade21..f7c3c8b 100644 (file)
--- a/drivers/staging/rtl8192ee/base.c
+++ b/drivers/staging/rtl8192ee/base.c
@@ -469,7 +469,7 @@ static void _rtl_init_deferred_work(struct ieee80211_hw *hw)
                    rtl92e_easy_concurrent_retrytimer_callback, (unsigned long)hw);
        /* <2> work queue */
        rtlpriv->works.hw = hw;
-       rtlpriv->works.rtl_wq = alloc_workqueue(rtlpriv->cfg->name, 0, 0);
+       rtlpriv->works.rtl_wq = alloc_workqueue("%s", 0, 0, rtlpriv->cfg->name);
        INIT_DELAYED_WORK(&rtlpriv->works.watchdog_wq,
                          (void *)rtl92e_watchdog_wq_callback);
        INIT_DELAYED_WORK(&rtlpriv->works.ips_nic_off_wq,
@@ -826,8 +826,7 @@ static u8 _rtl_get_vht_highest_n_rate(struct ieee80211_hw *hw,
        u8 hw_rate;
        u16 map = le16_to_cpu(sta->vht_cap.vht_mcs.tx_mcs_map);
 
-       if ((get_rf_type(rtlphy) == RF_2T2R) &&
-           (map & 0x000c) != 0x000c0) {
+       if (get_rf_type(rtlphy) == RF_2T2R) {
                if ((map & 0x000c) >> 2 == IEEE80211_VHT_MCS_SUPPORT_0_7)
                        hw_rate =
                        rtlpriv->cfg->maps[RTL_RC_VHT_RATE_2SS_MCS7];