aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPing-Ke Shih <pkshih@realtek.com>2017-12-29 03:31:12 -0500
committerKalle Valo <kvalo@codeaurora.org>2018-01-08 12:08:00 -0500
commit874e837d67d0db179c9771f38fd21df07c703e93 (patch)
tree5f6143ca6f39877e8fa958735aa1f554720d6d26
parent08431b627dfaaa559826f0b12b9c52118a6a30eb (diff)
rtlwifi: fill FW version and subversion
This commit fills FW version information of RTL8188EE and RTL8723, so the btcoex can cooperate with FW correctly. Also, we can display this version in debugfs. Signed-off-by: Ping-Ke Shih <pkshih@realtek.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-rw-r--r--drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c2
-rw-r--r--drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c
index a2eca669873b..63874512598b 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c
@@ -141,6 +141,8 @@ int rtl88e_download_fw(struct ieee80211_hw *hw,
141 return 1; 141 return 1;
142 142
143 pfwheader = (struct rtlwifi_firmware_header *)rtlhal->pfirmware; 143 pfwheader = (struct rtlwifi_firmware_header *)rtlhal->pfirmware;
144 rtlhal->fw_version = le16_to_cpu(pfwheader->version);
145 rtlhal->fw_subversion = pfwheader->subversion;
144 pfwdata = rtlhal->pfirmware; 146 pfwdata = rtlhal->pfirmware;
145 fwsize = rtlhal->fwsize; 147 fwsize = rtlhal->fwsize;
146 RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG, 148 RT_TRACE(rtlpriv, COMP_FW, DBG_DMESG,
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.c
index 0d1ebc861720..521039c5d4ce 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.c
@@ -200,6 +200,8 @@ int rtl8723_download_fw(struct ieee80211_hw *hw,
200 return 1; 200 return 1;
201 201
202 pfwheader = (struct rtlwifi_firmware_header *)rtlhal->pfirmware; 202 pfwheader = (struct rtlwifi_firmware_header *)rtlhal->pfirmware;
203 rtlhal->fw_version = le16_to_cpu(pfwheader->version);
204 rtlhal->fw_subversion = pfwheader->subversion;
203 pfwdata = rtlhal->pfirmware; 205 pfwdata = rtlhal->pfirmware;
204 fwsize = rtlhal->fwsize; 206 fwsize = rtlhal->fwsize;
205 207