diff options
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/rtlwifi/debug.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 7 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192de/sw.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192se/sw.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/wifi.h | 3 |
6 files changed, 25 insertions, 6 deletions
diff --git a/drivers/net/wireless/rtlwifi/debug.c b/drivers/net/wireless/rtlwifi/debug.c index b2f897acb23..1b5cb7153a5 100644 --- a/drivers/net/wireless/rtlwifi/debug.c +++ b/drivers/net/wireless/rtlwifi/debug.c | |||
@@ -28,17 +28,11 @@ | |||
28 | 28 | ||
29 | #include "wifi.h" | 29 | #include "wifi.h" |
30 | 30 | ||
31 | static unsigned int debug = DBG_EMERG; | ||
32 | module_param(debug, uint, 0); | ||
33 | MODULE_PARM_DESC(debug, "Set global debug level for rtlwifi (0,2-5)"); | ||
34 | |||
35 | void rtl_dbgp_flag_init(struct ieee80211_hw *hw) | 31 | void rtl_dbgp_flag_init(struct ieee80211_hw *hw) |
36 | { | 32 | { |
37 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 33 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
38 | u8 i; | 34 | u8 i; |
39 | 35 | ||
40 | rtlpriv->dbg.global_debuglevel = debug; | ||
41 | |||
42 | rtlpriv->dbg.global_debugcomponents = | 36 | rtlpriv->dbg.global_debugcomponents = |
43 | COMP_ERR | COMP_FW | COMP_INIT | COMP_RECV | COMP_SEND | | 37 | COMP_ERR | COMP_FW | COMP_INIT | COMP_RECV | COMP_SEND | |
44 | COMP_MLME | COMP_SCAN | COMP_INTR | COMP_LED | COMP_SEC | | 38 | COMP_MLME | COMP_SCAN | COMP_INTR | COMP_LED | COMP_SEC | |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c index b7ecb9e44aa..869f0725fd5 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | |||
@@ -129,6 +129,8 @@ int rtl92c_init_sw_vars(struct ieee80211_hw *hw) | |||
129 | 129 | ||
130 | rtlpci->irq_mask[1] = (u32) (IMR_CPWM | IMR_C2HCMD | 0); | 130 | rtlpci->irq_mask[1] = (u32) (IMR_CPWM | IMR_C2HCMD | 0); |
131 | 131 | ||
132 | /* for debug level */ | ||
133 | rtlpriv->dbg.global_debuglevel = rtlpriv->cfg->mod_params->debug; | ||
132 | /* for LPS & IPS */ | 134 | /* for LPS & IPS */ |
133 | rtlpriv->psc.inactiveps = rtlpriv->cfg->mod_params->inactiveps; | 135 | rtlpriv->psc.inactiveps = rtlpriv->cfg->mod_params->inactiveps; |
134 | rtlpriv->psc.swctrl_lps = rtlpriv->cfg->mod_params->swctrl_lps; | 136 | rtlpriv->psc.swctrl_lps = rtlpriv->cfg->mod_params->swctrl_lps; |
@@ -245,6 +247,7 @@ static struct rtl_mod_params rtl92ce_mod_params = { | |||
245 | .inactiveps = true, | 247 | .inactiveps = true, |
246 | .swctrl_lps = false, | 248 | .swctrl_lps = false, |
247 | .fwctrl_lps = true, | 249 | .fwctrl_lps = true, |
250 | .debug = DBG_EMERG, | ||
248 | }; | 251 | }; |
249 | 252 | ||
250 | static struct rtl_hal_cfg rtl92ce_hal_cfg = { | 253 | static struct rtl_hal_cfg rtl92ce_hal_cfg = { |
@@ -357,6 +360,7 @@ MODULE_DESCRIPTION("Realtek 8192C/8188C 802.11n PCI wireless"); | |||
357 | MODULE_FIRMWARE("rtlwifi/rtl8192cfw.bin"); | 360 | MODULE_FIRMWARE("rtlwifi/rtl8192cfw.bin"); |
358 | 361 | ||
359 | module_param_named(swenc, rtl92ce_mod_params.sw_crypto, bool, 0444); | 362 | module_param_named(swenc, rtl92ce_mod_params.sw_crypto, bool, 0444); |
363 | module_param_named(debug, rtl92ce_mod_params.debug, int, 0444); | ||
360 | module_param_named(ips, rtl92ce_mod_params.inactiveps, bool, 0444); | 364 | module_param_named(ips, rtl92ce_mod_params.inactiveps, bool, 0444); |
361 | module_param_named(swlps, rtl92ce_mod_params.swctrl_lps, bool, 0444); | 365 | module_param_named(swlps, rtl92ce_mod_params.swctrl_lps, bool, 0444); |
362 | module_param_named(fwlps, rtl92ce_mod_params.fwctrl_lps, bool, 0444); | 366 | module_param_named(fwlps, rtl92ce_mod_params.fwctrl_lps, bool, 0444); |
@@ -364,6 +368,7 @@ MODULE_PARM_DESC(swenc, "Set to 1 for software crypto (default 0)\n"); | |||
364 | MODULE_PARM_DESC(ips, "Set to 0 to not use link power save (default 1)\n"); | 368 | MODULE_PARM_DESC(ips, "Set to 0 to not use link power save (default 1)\n"); |
365 | MODULE_PARM_DESC(swlps, "Set to 1 to use SW control power save (default 0)\n"); | 369 | MODULE_PARM_DESC(swlps, "Set to 1 to use SW control power save (default 0)\n"); |
366 | MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n"); | 370 | MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n"); |
371 | MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)"); | ||
367 | 372 | ||
368 | static struct pci_driver rtl92ce_driver = { | 373 | static struct pci_driver rtl92ce_driver = { |
369 | .name = KBUILD_MODNAME, | 374 | .name = KBUILD_MODNAME, |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c index 424b8a0323e..feed1ed8d9b 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | |||
@@ -60,6 +60,7 @@ static int rtl92cu_init_sw_vars(struct ieee80211_hw *hw) | |||
60 | rtlpriv->dm.dm_flag = 0; | 60 | rtlpriv->dm.dm_flag = 0; |
61 | rtlpriv->dm.disable_framebursting = 0; | 61 | rtlpriv->dm.disable_framebursting = 0; |
62 | rtlpriv->dm.thermalvalue = 0; | 62 | rtlpriv->dm.thermalvalue = 0; |
63 | rtlpriv->dbg.global_debuglevel = rtlpriv->cfg->mod_params->debug; | ||
63 | rtlpriv->rtlhal.pfirmware = vmalloc(0x4000); | 64 | rtlpriv->rtlhal.pfirmware = vmalloc(0x4000); |
64 | if (!rtlpriv->rtlhal.pfirmware) { | 65 | if (!rtlpriv->rtlhal.pfirmware) { |
65 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, | 66 | RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, |
@@ -149,8 +150,14 @@ static struct rtl_hal_ops rtl8192cu_hal_ops = { | |||
149 | 150 | ||
150 | static struct rtl_mod_params rtl92cu_mod_params = { | 151 | static struct rtl_mod_params rtl92cu_mod_params = { |
151 | .sw_crypto = 0, | 152 | .sw_crypto = 0, |
153 | .debug = DBG_EMERG, | ||
152 | }; | 154 | }; |
153 | 155 | ||
156 | module_param_named(swenc, rtl92cu_mod_params.sw_crypto, bool, 0444); | ||
157 | module_param_named(debug, rtl92cu_mod_params.debug, int, 0444); | ||
158 | MODULE_PARM_DESC(swenc, "Set to 1 for software crypto (default 0)\n"); | ||
159 | MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)"); | ||
160 | |||
154 | static struct rtl_hal_usbint_cfg rtl92cu_interface_cfg = { | 161 | static struct rtl_hal_usbint_cfg rtl92cu_interface_cfg = { |
155 | /* rx */ | 162 | /* rx */ |
156 | .in_ep_num = RTL92C_USB_BULK_IN_NUM, | 163 | .in_ep_num = RTL92C_USB_BULK_IN_NUM, |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/sw.c b/drivers/net/wireless/rtlwifi/rtl8192de/sw.c index c681597c7f2..4fe8b15aca0 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192de/sw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192de/sw.c | |||
@@ -146,6 +146,8 @@ static int rtl92d_init_sw_vars(struct ieee80211_hw *hw) | |||
146 | 146 | ||
147 | rtlpci->irq_mask[1] = (u32) (IMR_CPWM | IMR_C2HCMD); | 147 | rtlpci->irq_mask[1] = (u32) (IMR_CPWM | IMR_C2HCMD); |
148 | 148 | ||
149 | /* for debug level */ | ||
150 | rtlpriv->dbg.global_debuglevel = rtlpriv->cfg->mod_params->debug; | ||
149 | /* for LPS & IPS */ | 151 | /* for LPS & IPS */ |
150 | rtlpriv->psc.inactiveps = rtlpriv->cfg->mod_params->inactiveps; | 152 | rtlpriv->psc.inactiveps = rtlpriv->cfg->mod_params->inactiveps; |
151 | rtlpriv->psc.swctrl_lps = rtlpriv->cfg->mod_params->swctrl_lps; | 153 | rtlpriv->psc.swctrl_lps = rtlpriv->cfg->mod_params->swctrl_lps; |
@@ -267,6 +269,7 @@ static struct rtl_mod_params rtl92de_mod_params = { | |||
267 | .inactiveps = true, | 269 | .inactiveps = true, |
268 | .swctrl_lps = true, | 270 | .swctrl_lps = true, |
269 | .fwctrl_lps = false, | 271 | .fwctrl_lps = false, |
272 | .debug = DBG_EMERG, | ||
270 | }; | 273 | }; |
271 | 274 | ||
272 | static struct rtl_hal_cfg rtl92de_hal_cfg = { | 275 | static struct rtl_hal_cfg rtl92de_hal_cfg = { |
@@ -377,6 +380,7 @@ MODULE_DESCRIPTION("Realtek 8192DE 802.11n Dual Mac PCI wireless"); | |||
377 | MODULE_FIRMWARE("rtlwifi/rtl8192defw.bin"); | 380 | MODULE_FIRMWARE("rtlwifi/rtl8192defw.bin"); |
378 | 381 | ||
379 | module_param_named(swenc, rtl92de_mod_params.sw_crypto, bool, 0444); | 382 | module_param_named(swenc, rtl92de_mod_params.sw_crypto, bool, 0444); |
383 | module_param_named(debug, rtl92de_mod_params.debug, int, 0444); | ||
380 | module_param_named(ips, rtl92de_mod_params.inactiveps, bool, 0444); | 384 | module_param_named(ips, rtl92de_mod_params.inactiveps, bool, 0444); |
381 | module_param_named(swlps, rtl92de_mod_params.swctrl_lps, bool, 0444); | 385 | module_param_named(swlps, rtl92de_mod_params.swctrl_lps, bool, 0444); |
382 | module_param_named(fwlps, rtl92de_mod_params.fwctrl_lps, bool, 0444); | 386 | module_param_named(fwlps, rtl92de_mod_params.fwctrl_lps, bool, 0444); |
@@ -384,6 +388,7 @@ MODULE_PARM_DESC(swenc, "Set to 1 for software crypto (default 0)\n"); | |||
384 | MODULE_PARM_DESC(ips, "Set to 0 to not use link power save (default 1)\n"); | 388 | MODULE_PARM_DESC(ips, "Set to 0 to not use link power save (default 1)\n"); |
385 | MODULE_PARM_DESC(swlps, "Set to 1 to use SW control power save (default 0)\n"); | 389 | MODULE_PARM_DESC(swlps, "Set to 1 to use SW control power save (default 0)\n"); |
386 | MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n"); | 390 | MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n"); |
391 | MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)"); | ||
387 | 392 | ||
388 | static struct pci_driver rtl92de_driver = { | 393 | static struct pci_driver rtl92de_driver = { |
389 | .name = KBUILD_MODNAME, | 394 | .name = KBUILD_MODNAME, |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c index 24bd331a548..cdaded0fbb8 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c | |||
@@ -160,6 +160,8 @@ static int rtl92s_init_sw_vars(struct ieee80211_hw *hw) | |||
160 | 160 | ||
161 | rtlpci->first_init = true; | 161 | rtlpci->first_init = true; |
162 | 162 | ||
163 | /* for debug level */ | ||
164 | rtlpriv->dbg.global_debuglevel = rtlpriv->cfg->mod_params->debug; | ||
163 | /* for LPS & IPS */ | 165 | /* for LPS & IPS */ |
164 | rtlpriv->psc.inactiveps = rtlpriv->cfg->mod_params->inactiveps; | 166 | rtlpriv->psc.inactiveps = rtlpriv->cfg->mod_params->inactiveps; |
165 | rtlpriv->psc.swctrl_lps = rtlpriv->cfg->mod_params->swctrl_lps; | 167 | rtlpriv->psc.swctrl_lps = rtlpriv->cfg->mod_params->swctrl_lps; |
@@ -272,6 +274,7 @@ static struct rtl_mod_params rtl92se_mod_params = { | |||
272 | .inactiveps = true, | 274 | .inactiveps = true, |
273 | .swctrl_lps = true, | 275 | .swctrl_lps = true, |
274 | .fwctrl_lps = false, | 276 | .fwctrl_lps = false, |
277 | .debug = DBG_EMERG, | ||
275 | }; | 278 | }; |
276 | 279 | ||
277 | /* Because memory R/W bursting will cause system hang/crash | 280 | /* Because memory R/W bursting will cause system hang/crash |
@@ -388,6 +391,7 @@ MODULE_DESCRIPTION("Realtek 8192S/8191S 802.11n PCI wireless"); | |||
388 | MODULE_FIRMWARE("rtlwifi/rtl8192sefw.bin"); | 391 | MODULE_FIRMWARE("rtlwifi/rtl8192sefw.bin"); |
389 | 392 | ||
390 | module_param_named(swenc, rtl92se_mod_params.sw_crypto, bool, 0444); | 393 | module_param_named(swenc, rtl92se_mod_params.sw_crypto, bool, 0444); |
394 | module_param_named(debug, rtl92se_mod_params.debug, int, 0444); | ||
391 | module_param_named(ips, rtl92se_mod_params.inactiveps, bool, 0444); | 395 | module_param_named(ips, rtl92se_mod_params.inactiveps, bool, 0444); |
392 | module_param_named(swlps, rtl92se_mod_params.swctrl_lps, bool, 0444); | 396 | module_param_named(swlps, rtl92se_mod_params.swctrl_lps, bool, 0444); |
393 | module_param_named(fwlps, rtl92se_mod_params.fwctrl_lps, bool, 0444); | 397 | module_param_named(fwlps, rtl92se_mod_params.fwctrl_lps, bool, 0444); |
@@ -395,6 +399,7 @@ MODULE_PARM_DESC(swenc, "Set to 1 for software crypto (default 0)\n"); | |||
395 | MODULE_PARM_DESC(ips, "Set to 0 to not use link power save (default 1)\n"); | 399 | MODULE_PARM_DESC(ips, "Set to 0 to not use link power save (default 1)\n"); |
396 | MODULE_PARM_DESC(swlps, "Set to 1 to use SW control power save (default 0)\n"); | 400 | MODULE_PARM_DESC(swlps, "Set to 1 to use SW control power save (default 0)\n"); |
397 | MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n"); | 401 | MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n"); |
402 | MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)"); | ||
398 | 403 | ||
399 | static struct pci_driver rtl92se_driver = { | 404 | static struct pci_driver rtl92se_driver = { |
400 | .name = KBUILD_MODNAME, | 405 | .name = KBUILD_MODNAME, |
diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h index 3126485393d..ae42cf8c2ab 100644 --- a/drivers/net/wireless/rtlwifi/wifi.h +++ b/drivers/net/wireless/rtlwifi/wifi.h | |||
@@ -1485,6 +1485,9 @@ struct rtl_mod_params { | |||
1485 | /* default: 0 = using hardware encryption */ | 1485 | /* default: 0 = using hardware encryption */ |
1486 | int sw_crypto; | 1486 | int sw_crypto; |
1487 | 1487 | ||
1488 | /* default: 0 = DBG_EMERG (0)*/ | ||
1489 | int debug; | ||
1490 | |||
1488 | /* default: 1 = using no linked power save */ | 1491 | /* default: 1 = using no linked power save */ |
1489 | bool inactiveps; | 1492 | bool inactiveps; |
1490 | 1493 | ||