1 files changed, 21 insertions, 14 deletions

diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
index ef63c0df006..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)
         rtlpriv->dm.dm_flag = 0;
         rtlpriv->dm.disable_framebursting = 0;
         rtlpriv->dm.thermalvalue = 0;
+        rtlpriv->dbg.global_debuglevel = rtlpriv->cfg->mod_params->debug;
         rtlpriv->rtlhal.pfirmware = vmalloc(0x4000);
         if (!rtlpriv->rtlhal.pfirmware) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
@@ -149,8 +150,14 @@ static struct rtl_hal_ops rtl8192cu_hal_ops = {
 
 static struct rtl_mod_params rtl92cu_mod_params = {
         .sw_crypto = 0,
+        .debug = DBG_EMERG,
 };
 
+module_param_named(swenc, rtl92cu_mod_params.sw_crypto, bool, 0444);
+module_param_named(debug, rtl92cu_mod_params.debug, int, 0444);
+MODULE_PARM_DESC(swenc, "Set to 1 for software crypto (default 0)\n");
+MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)");
+
 static struct rtl_hal_usbint_cfg rtl92cu_interface_cfg = {
         /* rx */
         .in_ep_num = RTL92C_USB_BULK_IN_NUM,
@@ -241,20 +248,20 @@ static struct rtl_hal_cfg rtl92cu_hal_cfg = {
         .maps[RTL_IMR_ROK] = IMR_ROK,
         .maps[RTL_IBSS_INT_MASKS] = (IMR_BCNINT | IMR_TBDOK | IMR_TBDER),
 
-        .maps[RTL_RC_CCK_RATE1M] = DESC92C_RATE1M,
-        .maps[RTL_RC_CCK_RATE2M] = DESC92C_RATE2M,
-        .maps[RTL_RC_CCK_RATE5_5M] = DESC92C_RATE5_5M,
-        .maps[RTL_RC_CCK_RATE11M] = DESC92C_RATE11M,
-        .maps[RTL_RC_OFDM_RATE6M] = DESC92C_RATE6M,
-        .maps[RTL_RC_OFDM_RATE9M] = DESC92C_RATE9M,
-        .maps[RTL_RC_OFDM_RATE12M] = DESC92C_RATE12M,
-        .maps[RTL_RC_OFDM_RATE18M] = DESC92C_RATE18M,
-        .maps[RTL_RC_OFDM_RATE24M] = DESC92C_RATE24M,
-        .maps[RTL_RC_OFDM_RATE36M] = DESC92C_RATE36M,
-        .maps[RTL_RC_OFDM_RATE48M] = DESC92C_RATE48M,
-        .maps[RTL_RC_OFDM_RATE54M] = DESC92C_RATE54M,
-        .maps[RTL_RC_HT_RATEMCS7] = DESC92C_RATEMCS7,
-        .maps[RTL_RC_HT_RATEMCS15] = DESC92C_RATEMCS15,
+        .maps[RTL_RC_CCK_RATE1M] = DESC92_RATE1M,
+        .maps[RTL_RC_CCK_RATE2M] = DESC92_RATE2M,
+        .maps[RTL_RC_CCK_RATE5_5M] = DESC92_RATE5_5M,
+        .maps[RTL_RC_CCK_RATE11M] = DESC92_RATE11M,
+        .maps[RTL_RC_OFDM_RATE6M] = DESC92_RATE6M,
+        .maps[RTL_RC_OFDM_RATE9M] = DESC92_RATE9M,
+        .maps[RTL_RC_OFDM_RATE12M] = DESC92_RATE12M,
+        .maps[RTL_RC_OFDM_RATE18M] = DESC92_RATE18M,
+        .maps[RTL_RC_OFDM_RATE24M] = DESC92_RATE24M,
+        .maps[RTL_RC_OFDM_RATE36M] = DESC92_RATE36M,
+        .maps[RTL_RC_OFDM_RATE48M] = DESC92_RATE48M,
+        .maps[RTL_RC_OFDM_RATE54M] = DESC92_RATE54M,
+        .maps[RTL_RC_HT_RATEMCS7] = DESC92_RATEMCS7,
+        .maps[RTL_RC_HT_RATEMCS15] = DESC92_RATEMCS15,
 };
 
 #define USB_VENDER_ID_REALTEK           0x0bda