staging: rtl8192e: Rename EnableHWSecurityConfig8192

Use naming schema found in other rtlwifi devices.
Rename EnableHWSecurityConfig8192 to rtl92e_enable_hw_security_config.

Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index c7260ef80b76b219beb6636ec5ce41f82837be78..ead3e2208fb7abfc4e0fd9748d39b677ec92b6df 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -1001,7 +1001,7 @@ void rtl92e_link_change(struct net_device *dev)
                priv->ops->update_ratr_table(dev);
                if ((KEY_TYPE_WEP40 == ieee->pairwise_key_type) ||
                    (KEY_TYPE_WEP104 == ieee->pairwise_key_type))
-                       EnableHWSecurityConfig8192(dev);
+                       rtl92e_enable_hw_security_config(dev);
        } else {
                write_nic_byte(dev, 0x173, 0);
        }

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
index 66e06bea21d345d1c015e20ab636fec31e86c8ce..39640dda4acff1762b3b6ffe0b94b6b0f64f0c59 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
@@ -36,7 +36,7 @@ void rtl92e_cam_reset(struct net_device *dev)
        write_nic_dword(dev, RWCAM, ulcommand);
 }
 
-void EnableHWSecurityConfig8192(struct net_device *dev)
+void rtl92e_enable_hw_security_config(struct net_device *dev)
 {
        u8 SECR_value = 0x0;
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h
index 001ff4021a60c3aa46df5116e521ef4a01ca80bc..b0619b77b1f0fd9e986520f3594bef8f10aca5a5 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h
@@ -29,7 +29,7 @@
 struct net_device;
 
 void rtl92e_cam_reset(struct net_device *dev);
-void EnableHWSecurityConfig8192(struct net_device *dev);
+void rtl92e_enable_hw_security_config(struct net_device *dev);
 void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType,
            const u8 *MacAddr, u8 DefaultKey, u32 *KeyContent);
 void set_swcam(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType,

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index b12256ce44b492eefe267451ca98f67fc8c383c0..df3b846aefa3fa5a8d6dca4bcd5c76986b6b68b2 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -1350,7 +1350,7 @@ RESET_START:
                priv->RFChangeInProgress = false;
                spin_unlock_irqrestore(&priv->rf_ps_lock, flag);
 
-               EnableHWSecurityConfig8192(dev);
+               rtl92e_enable_hw_security_config(dev);
 
                if (ieee->state == RTLLIB_LINKED && ieee->iw_mode ==
                    IW_MODE_INFRA) {
@@ -2375,7 +2375,7 @@ static int rtl8192_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                                        if (is_zero_ether_addr(ieee->ap_mac_addr))
                                                ieee->iw_mode = IW_MODE_ADHOC;
                                        memcpy((u8 *)key, ipw->u.crypt.key, 16);
-                                       EnableHWSecurityConfig8192(dev);
+                                       rtl92e_enable_hw_security_config(dev);
                                        set_swcam(dev, 4, ipw->u.crypt.idx,
                                                  ieee->pairwise_key_type,
                                                  (u8 *)ieee->ap_mac_addr,

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
index df7cf084a76b062beedd5c137c51d43d7fae5e0c..4795c727bb5b0e8419a425cbab66d1738b4d9022 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
@@ -750,12 +750,12 @@ static int r8192_wx_set_enc(struct net_device *dev,
                }
                if (wrqu->encoding.length == 0x5) {
                        ieee->pairwise_key_type = KEY_TYPE_WEP40;
-                       EnableHWSecurityConfig8192(dev);
+                       rtl92e_enable_hw_security_config(dev);
                }
 
                else if (wrqu->encoding.length == 0xd) {
                        ieee->pairwise_key_type = KEY_TYPE_WEP104;
-                               EnableHWSecurityConfig8192(dev);
+                               rtl92e_enable_hw_security_config(dev);
                        setKey(dev, key_idx, key_idx, KEY_TYPE_WEP104,
                               zero_addr[key_idx], 0, hwkey);
                        set_swcam(dev, key_idx, key_idx, KEY_TYPE_WEP104,
@@ -943,7 +943,7 @@ static int r8192_wx_set_enc_ext(struct net_device *dev,
                        if ((ext->key_len == 13) && (alg == KEY_TYPE_WEP40))
                                alg = KEY_TYPE_WEP104;
                        ieee->pairwise_key_type = alg;
-                       EnableHWSecurityConfig8192(dev);
+                       rtl92e_enable_hw_security_config(dev);
                }
                memcpy((u8 *)key, ext->key, 16);