staging: rtl8192e: Rename CamResetAllEntry

Use naming schema found in other rtlwifi devices.
Rename CamResetAllEntry to rtl92e_cam_reset.

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 b6d26fa4e2ee77ca8964bbb91a65eeb9db87be59..c7260ef80b76b219beb6636ec5ce41f82837be78 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -809,7 +809,7 @@ start:
 
        if (priv->ResetProgress == RESET_TYPE_NORESET)
                rtl8192_SetWirelessMode(dev, priv->rtllib->mode);
-       CamResetAllEntry(dev);
+       rtl92e_cam_reset(dev);
        {
                u8 SECR_value = 0x0;
 

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
index f246222e5fc954e83cc8fb8be0344aaf057d48a2..4c47dd969254e4951327f714e9b5273b425324df 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
@@ -28,7 +28,7 @@
 #include "r8190P_rtl8256.h" /* RTL8225 Radio frontend */
 #include "r8192E_cmdpkt.h"
 
-void CamResetAllEntry(struct net_device *dev)
+void rtl92e_cam_reset(struct net_device *dev)
 {
        u32 ulcommand = 0;
 

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h
index f23ab46c77e7f7fb962d0d0e821a20888efa8ac8..9ef80ec3a672fbb13a13cc27cbe8f2405f008f85 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h
@@ -28,7 +28,7 @@
 #include <linux/types.h>
 struct net_device;
 
-void CamResetAllEntry(struct net_device *dev);
+void rtl92e_cam_reset(struct net_device *dev);
 void EnableHWSecurityConfig8192(struct net_device *dev);
 void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType,
            const u8 *MacAddr, u8 DefaultKey, u32 *KeyContent);

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index c206e1dc1014e764cc6d2abad28c83b8bf7c045f..65d6043ffdf2c514a8923a8a55eeeb4845ecf07a 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -824,7 +824,7 @@ static int rtl8192_sta_down(struct net_device *dev, bool shutdownrf)
        priv->rtllib->wpa_ie_len = 0;
        kfree(priv->rtllib->wpa_ie);
        priv->rtllib->wpa_ie = NULL;
-       CamResetAllEntry(dev);
+       rtl92e_cam_reset(dev);
        memset(priv->rtllib->swcamtable, 0, sizeof(struct sw_cam_table) * 32);
        rtl8192_irq_disable(dev);
 

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
index 15fc48440cdcd1fdfa4c752752c542aa372ef9fe..df7cf084a76b062beedd5c137c51d43d7fae5e0c 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
@@ -711,7 +711,7 @@ static int r8192_wx_set_enc(struct net_device *dev,
 
        if (wrqu->encoding.flags & IW_ENCODE_DISABLED) {
                ieee->pairwise_key_type = ieee->group_key_type = KEY_TYPE_NA;
-               CamResetAllEntry(dev);
+               rtl92e_cam_reset(dev);
                memset(priv->rtllib->swcamtable, 0,
                       sizeof(struct sw_cam_table) * 32);
                goto end_hw_sec;
@@ -926,7 +926,7 @@ static int r8192_wx_set_enc_ext(struct net_device *dev,
                     ext->alg == IW_ENCODE_ALG_NONE) {
                        ieee->pairwise_key_type = ieee->group_key_type
                                                = KEY_TYPE_NA;
-                       CamResetAllEntry(dev);
+                       rtl92e_cam_reset(dev);
                        memset(priv->rtllib->swcamtable, 0,
                               sizeof(struct sw_cam_table) * 32);
                        goto end_hw_sec;