These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / net / wireless / realtek / rtlwifi / rtl8192ee / fw.c

diff --git a/kernel/drivers/net/wireless/rtlwifi/rtl8192ee/fw.c b/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c
similarity index 98%
rename from kernel/drivers/net/wireless/rtlwifi/rtl8192ee/fw.c
rename to kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c
index c5d4b80..0708eed 100644 (file)
--- a/kernel/drivers/net/wireless/rtlwifi/rtl8192ee/fw.c
+++ b/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c
@@ -198,7 +198,7 @@ int rtl92ee_download_fw(struct ieee80211_hw *hw, bool buse_wake_on_wlan_fw)
 {
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-       struct rtl92c_firmware_header *pfwheader;
+       struct rtlwifi_firmware_header *pfwheader;
        u8 *pfwdata;
        u32 fwsize;
        int err;
@@ -207,8 +207,8 @@ int rtl92ee_download_fw(struct ieee80211_hw *hw, bool buse_wake_on_wlan_fw)
        if (!rtlhal->pfirmware)
                return 1;
 
-       pfwheader = (struct rtl92c_firmware_header *)rtlhal->pfirmware;
-       rtlhal->fw_version = pfwheader->version;
+       pfwheader = (struct rtlwifi_firmware_header *)rtlhal->pfirmware;
+       rtlhal->fw_version = le16_to_cpu(pfwheader->version);
        rtlhal->fw_subversion = pfwheader->subversion;
        pfwdata = (u8 *)rtlhal->pfirmware;
        fwsize = rtlhal->fwsize;
@@ -219,10 +219,10 @@ int rtl92ee_download_fw(struct ieee80211_hw *hw, bool buse_wake_on_wlan_fw)
                RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
                         "Firmware Version(%d), Signature(%#x),Size(%d)\n",
                          pfwheader->version, pfwheader->signature,
-                         (int)sizeof(struct rtl92c_firmware_header));
+                         (int)sizeof(struct rtlwifi_firmware_header));
 
-               pfwdata = pfwdata + sizeof(struct rtl92c_firmware_header);
-               fwsize = fwsize - sizeof(struct rtl92c_firmware_header);
+               pfwdata = pfwdata + sizeof(struct rtlwifi_firmware_header);
+               fwsize = fwsize - sizeof(struct rtlwifi_firmware_header);
        } else {
                RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
                         "Firmware no Header, Signature(%#x)\n",
@@ -875,7 +875,7 @@ static void _rtl92ee_c2h_content_parsing(struct ieee80211_hw *hw, u8 c2h_cmd_id,
                break;
        default:
                RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
-                        "[C2H], Unkown packet!! CmdId(%#X)!\n", c2h_cmd_id);
+                        "[C2H], Unknown packet!! CmdId(%#X)!\n", c2h_cmd_id);
                break;
        }
 }