[PATCH 4.5 07/88] rtlwifi: Fix size of wireless mode variable

[Greg Kroah-Hartman]

4.5-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Larry Finger <larry.fin...@lwfinger.net>

commit 73fb270592164b1917442f8bff4c791d095ee2ef upstream.

Smatch reports the following warning:

  CHECK   drivers/net/wireless/realtek/rtlwifi/rc.c
drivers/net/wireless/realtek/rtlwifi/rc.c:144 _rtl_rc_rate_set_series() warn: 
impossible condition '(wireless_mode == 256) => (0-255 == 256)'

This warning arises because commit acc6907b87a9 ("rtlwifi: Fix warning
from ieee80211_get_tx_rates() when using 5G") now checks the wireless
mode for WIRELESS_MODE_AC_ONLY (BIT(8)) in _rtl_rc_rate_set_series().
As a result, all quantities used to store the wireless mode must be u16.

This patch also reorders struct rtl_sta_info to save a little space.

Fixes: d76d65fd2695 ("rtlwifi: fix broken VHT support")
Reported-by: Dan Williams <d...@redhat.com>
Signed-off-by: Larry Finger <larry.fin...@lwfinger.net>
Signed-off-by: Kalle Valo <kv...@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 drivers/net/wireless/realtek/rtlwifi/rc.c           |    4 ++--
 drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c |    2 +-
 drivers/net/wireless/realtek/rtlwifi/wifi.h         |    9 ++++-----
 3 files changed, 7 insertions(+), 8 deletions(-)

--- a/drivers/net/wireless/realtek/rtlwifi/rc.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rc.c
@@ -41,7 +41,7 @@ static u8 _rtl_rc_get_highest_rix(struct
        struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
        struct rtl_phy *rtlphy = &(rtlpriv->phy);
        struct rtl_sta_info *sta_entry = NULL;
-       u8 wireless_mode = 0;
+       u16 wireless_mode = 0;
 
        /*
         *this rate is no use for true rate, firmware
@@ -99,7 +99,7 @@ static void _rtl_rc_rate_set_series(stru
 {
        struct rtl_mac *mac = rtl_mac(rtlpriv);
        struct rtl_sta_info *sta_entry = NULL;
-       u8 wireless_mode = 0;
+       u16 wireless_mode = 0;
        u8 sgi_20 = 0, sgi_40 = 0, sgi_80 = 0;
 
        if (sta) {
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c
@@ -3855,7 +3855,7 @@ void rtl8821ae_update_channel_access_set
 {
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
-       u8 wireless_mode = mac->mode;
+       u16 wireless_mode = mac->mode;
        u8 sifs_timer, r2t_sifs;
 
        rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_SLOT_TIME,
--- a/drivers/net/wireless/realtek/rtlwifi/wifi.h
+++ b/drivers/net/wireless/realtek/rtlwifi/wifi.h
@@ -1323,14 +1323,13 @@ struct rtl_tid_data {
 
 struct rtl_sta_info {
        struct list_head list;
-       u8 ratr_index;
-       u8 wireless_mode;
-       u8 mimo_ps;
-       u8 mac_addr[ETH_ALEN];
        struct rtl_tid_data tids[MAX_TID_COUNT];
-
        /* just used for ap adhoc or mesh*/
        struct rssi_sta rssi_stat;
+       u16 wireless_mode;
+       u8 ratr_index;
+       u8 mimo_ps;
+       u8 mac_addr[ETH_ALEN];
 } __packed;
 
 struct rtl_priv;