staging: rtl8192e: Rename set_swcam

Use naming schema found in other rtlwifi devices.
Rename set_swcam to rtl92e_set_swcam.

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 8e4da40793bd5f8ea447667673c3b34fd486a282..9c14286146a2e286fe455506566184341fe8665c 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
@@ -68,8 +68,9 @@ void rtl92e_enable_hw_security_config(struct net_device *dev)
        write_nic_byte(dev, SECR,  SECR_value);
 }
 
-void set_swcam(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType,
-              const u8 *MacAddr, u8 DefaultKey, u32 *KeyContent, u8 is_mesh)
+void rtl92e_set_swcam(struct net_device *dev, u8 EntryNo, u8 KeyIndex,
+                     u16 KeyType, const u8 *MacAddr, u8 DefaultKey,
+                     u32 *KeyContent, u8 is_mesh)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        struct rtllib_device *ieee = priv->rtllib;

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h
index a26f3f5254b5f729226cb5173863a392bc3c2775..9ef8b36fc6b51bfb965ada3322fb3bbdaacb1f61 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h
@@ -33,8 +33,9 @@ void rtl92e_enable_hw_security_config(struct net_device *dev);
 void rtl92e_set_key(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 rtl92e_set_swcam(struct net_device *dev, u8 EntryNo, u8 KeyIndex,
+                     u16 KeyType, const u8 *MacAddr, u8 DefaultKey,
+                     u32 *KeyContent, u8 is_mesh);
 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 00f38ebac1904967e8e1f2d494d982221d43e69e..2a34e4d2e3ff187561f22067356f7ff6a4bb83c8 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -2376,20 +2376,22 @@ static int rtl8192_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                                                ieee->iw_mode = IW_MODE_ADHOC;
                                        memcpy((u8 *)key, ipw->u.crypt.key, 16);
                                        rtl92e_enable_hw_security_config(dev);
-                                       set_swcam(dev, 4, ipw->u.crypt.idx,
-                                                 ieee->pairwise_key_type,
-                                                 (u8 *)ieee->ap_mac_addr,
-                                                 0, key, 0);
+                                       rtl92e_set_swcam(dev, 4,
+                                                        ipw->u.crypt.idx,
+                                                        ieee->pairwise_key_type,
+                                                        (u8 *)ieee->ap_mac_addr,
+                                                        0, key, 0);
                                        rtl92e_set_key(dev, 4, ipw->u.crypt.idx,
                                                       ieee->pairwise_key_type,
                                                       (u8 *)ieee->ap_mac_addr,
                                                       0, key);
                                        if (ieee->iw_mode == IW_MODE_ADHOC) {
-                                               set_swcam(dev, ipw->u.crypt.idx,
-                                                       ipw->u.crypt.idx,
-                                                       ieee->pairwise_key_type,
-                                                       (u8 *)ieee->ap_mac_addr,
-                                                       0, key, 0);
+                                               rtl92e_set_swcam(dev,
+                                                                ipw->u.crypt.idx,
+                                                                ipw->u.crypt.idx,
+                                                                ieee->pairwise_key_type,
+                                                                (u8 *)ieee->ap_mac_addr,
+                                                                0, key, 0);
                                                rtl92e_set_key(dev,
                                                               ipw->u.crypt.idx,
                                                               ipw->u.crypt.idx,
@@ -2420,10 +2422,11 @@ static int rtl8192_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                                        ieee->group_key_type = KEY_TYPE_NA;
 
                                if (ieee->group_key_type) {
-                                       set_swcam(dev, ipw->u.crypt.idx,
-                                                 ipw->u.crypt.idx,
-                                                 ieee->group_key_type,
-                                                 broadcast_addr, 0, key, 0);
+                                       rtl92e_set_swcam(dev, ipw->u.crypt.idx,
+                                                        ipw->u.crypt.idx,
+                                                        ieee->group_key_type,
+                                                        broadcast_addr, 0, key,
+                                                        0);
                                        rtl92e_set_key(dev, ipw->u.crypt.idx,
                                                       ipw->u.crypt.idx,
                                                       ieee->group_key_type,

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
index b2a4bf16d8bcf44e243dddaa65e16c05b7b1bf27..1b29f14dd2b24c8f7ab28a065596f672dadc9d83 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
@@ -758,8 +758,8 @@ static int r8192_wx_set_enc(struct net_device *dev,
                                rtl92e_enable_hw_security_config(dev);
                        rtl92e_set_key(dev, key_idx, key_idx, KEY_TYPE_WEP104,
                                       zero_addr[key_idx], 0, hwkey);
-                       set_swcam(dev, key_idx, key_idx, KEY_TYPE_WEP104,
-                                 zero_addr[key_idx], 0, hwkey, 0);
+                       rtl92e_set_swcam(dev, key_idx, key_idx, KEY_TYPE_WEP104,
+                                        zero_addr[key_idx], 0, hwkey, 0);
                } else {
                        netdev_info(dev,
                                    "wrong type in WEP, not WEP40 and WEP104\n");
@@ -951,21 +951,21 @@ static int r8192_wx_set_enc_ext(struct net_device *dev,
                        if (ext->key_len == 13)
                                ieee->pairwise_key_type = alg = KEY_TYPE_WEP104;
                        rtl92e_set_key(dev, idx, idx, alg, zero, 0, key);
-                       set_swcam(dev, idx, idx, alg, zero, 0, key, 0);
+                       rtl92e_set_swcam(dev, idx, idx, alg, zero, 0, key, 0);
                } else if (group) {
                        ieee->group_key_type = alg;
                        rtl92e_set_key(dev, idx, idx, alg, broadcast_addr, 0,
                                       key);
-                       set_swcam(dev, idx, idx, alg, broadcast_addr, 0,
-                                 key, 0);
+                       rtl92e_set_swcam(dev, idx, idx, alg, broadcast_addr, 0,
+                                        key, 0);
                } else {
                        if ((ieee->pairwise_key_type == KEY_TYPE_CCMP) &&
                             ieee->pHTInfo->bCurrentHTSupport)
                                write_nic_byte(dev, 0x173, 1);
                        rtl92e_set_key(dev, 4, idx, alg,
                                       (u8 *)ieee->ap_mac_addr, 0, key);
-                       set_swcam(dev, 4, idx, alg, (u8 *)ieee->ap_mac_addr,
-                                 0, key, 0);
+                       rtl92e_set_swcam(dev, 4, idx, alg,
+                                        (u8 *)ieee->ap_mac_addr, 0, key, 0);
                }