Merge branch 'parisc-3.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[cascardo/linux.git] / drivers / staging / rtl8723au / core / rtw_mlme.c

diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c
index 95bed7a..7299ef0 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme.c
@@ -1022,11 +1022,9 @@ rtw_joinbss_update_network23a(struct rtw_adapter *padapter,
         * the ptarget_wlan->network.Rssi is raw data, we use
         * ptarget_wlan->network.SignalStrength instead (has scaled)
         */
-       padapter->recvpriv.rssi = translate_percentage_to_dbm(
-               ptarget_wlan->network.SignalStrength);
-       DBG_8723A("%s signal_strength:%3u, rssi:%3d, signal_qual:%3u\n",
+       DBG_8723A("%s signal_strength:%3u, signal_qual:%3u\n",
                  __func__, padapter->recvpriv.signal_strength,
-                 padapter->recvpriv.rssi, padapter->recvpriv.signal_qual);
+                 padapter->recvpriv.signal_qual);
        rtw_set_signal_stat_timer(&padapter->recvpriv);
 
        /* update fw_state will clr _FW_UNDER_LINKING here indirectly */
@@ -2153,9 +2151,9 @@ bool rtw_restructure_ht_ie23a(struct rtw_adapter *padapter, u8 *in_ie,
 
                memset(&ht_capie, 0, sizeof(struct ieee80211_ht_cap));
 
-               ht_capie.cap_info = IEEE80211_HT_CAP_SUP_WIDTH_20_40 |
+               ht_capie.cap_info = cpu_to_le16(IEEE80211_HT_CAP_SUP_WIDTH_20_40 |
                        IEEE80211_HT_CAP_SGI_20 | IEEE80211_HT_CAP_SGI_40 |
-                       IEEE80211_HT_CAP_TX_STBC | IEEE80211_HT_CAP_DSSSCCK40;
+                       IEEE80211_HT_CAP_TX_STBC | IEEE80211_HT_CAP_DSSSCCK40);
 
                GetHalDefVar8192CUsb(padapter, HAL_DEF_RX_PACKET_OFFSET,
                                     &rx_packet_offset);