diff options
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192se/sw.c')
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192se/sw.c | 65 |
1 files changed, 50 insertions, 15 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c index 0c47310b39b..ca38dd9f356 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c | |||
@@ -30,6 +30,8 @@ | |||
30 | #include "../wifi.h" | 30 | #include "../wifi.h" |
31 | #include "../core.h" | 31 | #include "../core.h" |
32 | #include "../pci.h" | 32 | #include "../pci.h" |
33 | #include "../base.h" | ||
34 | #include "../pci.h" | ||
33 | #include "reg.h" | 35 | #include "reg.h" |
34 | #include "def.h" | 36 | #include "def.h" |
35 | #include "phy.h" | 37 | #include "phy.h" |
@@ -86,12 +88,53 @@ static void rtl92s_init_aspm_vars(struct ieee80211_hw *hw) | |||
86 | rtlpci->const_support_pciaspm = 2; | 88 | rtlpci->const_support_pciaspm = 2; |
87 | } | 89 | } |
88 | 90 | ||
91 | static void rtl92se_fw_cb(const struct firmware *firmware, void *context) | ||
92 | { | ||
93 | struct ieee80211_hw *hw = context; | ||
94 | struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw); | ||
95 | struct rtl_priv *rtlpriv = rtl_priv(hw); | ||
96 | struct rtl_pci *rtlpci = rtl_pcidev(pcipriv); | ||
97 | struct rt_firmware *pfirmware = NULL; | ||
98 | int err; | ||
99 | |||
100 | RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD, | ||
101 | "Firmware callback routine entered!\n"); | ||
102 | complete(&rtlpriv->firmware_loading_complete); | ||
103 | if (!firmware) { | ||
104 | pr_err("Firmware %s not available\n", rtlpriv->cfg->fw_name); | ||
105 | rtlpriv->max_fw_size = 0; | ||
106 | return; | ||
107 | } | ||
108 | if (firmware->size > rtlpriv->max_fw_size) { | ||
109 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, | ||
110 | "Firmware is too big!\n"); | ||
111 | release_firmware(firmware); | ||
112 | return; | ||
113 | } | ||
114 | pfirmware = (struct rt_firmware *)rtlpriv->rtlhal.pfirmware; | ||
115 | memcpy(pfirmware->sz_fw_tmpbuffer, firmware->data, firmware->size); | ||
116 | pfirmware->sz_fw_tmpbufferlen = firmware->size; | ||
117 | release_firmware(firmware); | ||
118 | |||
119 | err = ieee80211_register_hw(hw); | ||
120 | if (err) { | ||
121 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, | ||
122 | "Can't register mac80211 hw\n"); | ||
123 | return; | ||
124 | } else { | ||
125 | rtlpriv->mac80211.mac80211_registered = 1; | ||
126 | } | ||
127 | rtlpci->irq_alloc = 1; | ||
128 | set_bit(RTL_STATUS_INTERFACE_START, &rtlpriv->status); | ||
129 | |||
130 | /*init rfkill */ | ||
131 | rtl_init_rfkill(hw); | ||
132 | } | ||
133 | |||
89 | static int rtl92s_init_sw_vars(struct ieee80211_hw *hw) | 134 | static int rtl92s_init_sw_vars(struct ieee80211_hw *hw) |
90 | { | 135 | { |
91 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 136 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
92 | struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); | 137 | struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); |
93 | const struct firmware *firmware; | ||
94 | struct rt_firmware *pfirmware = NULL; | ||
95 | int err = 0; | 138 | int err = 0; |
96 | u16 earlyrxthreshold = 7; | 139 | u16 earlyrxthreshold = 7; |
97 | 140 | ||
@@ -189,27 +232,19 @@ static int rtl92s_init_sw_vars(struct ieee80211_hw *hw) | |||
189 | return 1; | 232 | return 1; |
190 | } | 233 | } |
191 | 234 | ||
235 | rtlpriv->max_fw_size = sizeof(struct rt_firmware); | ||
236 | |||
192 | pr_info("Driver for Realtek RTL8192SE/RTL8191SE\n" | 237 | pr_info("Driver for Realtek RTL8192SE/RTL8191SE\n" |
193 | "Loading firmware %s\n", rtlpriv->cfg->fw_name); | 238 | "Loading firmware %s\n", rtlpriv->cfg->fw_name); |
194 | /* request fw */ | 239 | /* request fw */ |
195 | err = request_firmware(&firmware, rtlpriv->cfg->fw_name, | 240 | err = request_firmware_nowait(THIS_MODULE, 1, rtlpriv->cfg->fw_name, |
196 | rtlpriv->io.dev); | 241 | rtlpriv->io.dev, GFP_KERNEL, hw, |
242 | rtl92se_fw_cb); | ||
197 | if (err) { | 243 | if (err) { |
198 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, | 244 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, |
199 | "Failed to request firmware!\n"); | 245 | "Failed to request firmware!\n"); |
200 | return 1; | 246 | return 1; |
201 | } | 247 | } |
202 | if (firmware->size > sizeof(struct rt_firmware)) { | ||
203 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, | ||
204 | "Firmware is too big!\n"); | ||
205 | release_firmware(firmware); | ||
206 | return 1; | ||
207 | } | ||
208 | |||
209 | pfirmware = (struct rt_firmware *)rtlpriv->rtlhal.pfirmware; | ||
210 | memcpy(pfirmware->sz_fw_tmpbuffer, firmware->data, firmware->size); | ||
211 | pfirmware->sz_fw_tmpbufferlen = firmware->size; | ||
212 | release_firmware(firmware); | ||
213 | 248 | ||
214 | return err; | 249 | return err; |
215 | } | 250 | } |