staging: rtl8192e: Rename CamRestoreAllEntry

Use naming schema found in other rtlwifi devices.
Rename CamRestoreAllEntry to rtl92e_cam_restore.

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/rtl_cam.c b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
index 4c47dd969254e4951327f714e9b5273b425324df..66e06bea21d345d1c015e20ab636fec31e86c8ce 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
@@ -154,7 +154,7 @@ void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType,
        RT_TRACE(COMP_SEC, "=========>after set key, usconfig:%x\n", usConfig);
 }
 
-void CamRestoreAllEntry(struct net_device *dev)
+void rtl92e_cam_restore(struct net_device *dev)
 {
        u8 EntryId = 0;
        struct r8192_priv *priv = rtllib_priv(dev);
@@ -170,7 +170,7 @@ void CamRestoreAllEntry(struct net_device *dev)
                0xff, 0xff, 0xff, 0xff, 0xff, 0xff
        };
 
-       RT_TRACE(COMP_SEC, "CamRestoreAllEntry:\n");
+       RT_TRACE(COMP_SEC, "rtl92e_cam_restore:\n");
 
 
        if ((priv->rtllib->pairwise_key_type == KEY_TYPE_WEP40) ||

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h
index 9ef80ec3a672fbb13a13cc27cbe8f2405f008f85..001ff4021a60c3aa46df5116e521ef4a01ca80bc 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h
@@ -34,6 +34,6 @@ 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,
               const u8 *MacAddr, u8 DefaultKey, u32 *KeyContent, u8 is_mesh);
-void CamRestoreAllEntry(struct net_device *dev);
+void rtl92e_cam_restore(struct net_device *dev);
 
 #endif

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 65d6043ffdf2c514a8923a8a55eeeb4845ecf07a..b12256ce44b492eefe267451ca98f67fc8c383c0 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -1376,7 +1376,7 @@ RESET_START:
                        rtl819x_silentreset_mesh_bk(dev, IsPortal);
                }
 
-               CamRestoreAllEntry(dev);
+               rtl92e_cam_restore(dev);
                dm_restore_dynamic_mechanism_state(dev);
 END:
                priv->ResetProgress = RESET_TYPE_NORESET;