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

[kvmfornfv.git] / kernel / drivers / net / wireless / realtek / rtlwifi / rtl8192c / fw_common.c

diff --git a/kernel/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c b/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c
similarity index 98%
rename from kernel/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
rename to kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c
index 29983bc..43fcb25 100644 (file)
--- a/kernel/drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
+++ b/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c
@@ -221,7 +221,7 @@ int rtl92c_download_fw(struct ieee80211_hw *hw)
 {
        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;
@@ -230,18 +230,19 @@ int rtl92c_download_fw(struct ieee80211_hw *hw)
        if (!rtlhal->pfirmware)
                return 1;
 
-       pfwheader = (struct rtl92c_firmware_header *)rtlhal->pfirmware;
+       pfwheader = (struct rtlwifi_firmware_header *)rtlhal->pfirmware;
        pfwdata = (u8 *)rtlhal->pfirmware;
        fwsize = rtlhal->fwsize;
-
        if (IS_FW_HEADER_EXIST(pfwheader)) {
                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);
+               rtlhal->fw_version = le16_to_cpu(pfwheader->version);
+               rtlhal->fw_subversion = pfwheader->subversion;
+               pfwdata = pfwdata + sizeof(struct rtlwifi_firmware_header);
+               fwsize = fwsize - sizeof(struct rtlwifi_firmware_header);
        }
 
        _rtl92c_enable_fw_download(hw, true);