staging: rtl8192e: Remove is_mesh from rtl92e_set_swcam

Function rtl92e_set_swcam() has parameter is_mesh which is in all calls 0.
Remove dead code.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/5d324977054f3a27b89c5c73da82e9c01c6dca45.1690615475.git.philipp.g.hortmann@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 6d9e5c2..f9ddb83 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
@@ -50,7 +50,7 @@ void rtl92e_enable_hw_security_config(struct net_device *dev)
 
 void rtl92e_set_swcam(struct net_device *dev, u8 EntryNo, u8 KeyIndex,
                      u16 KeyType, const u8 *MacAddr, u8 DefaultKey,
-                     u32 *KeyContent, u8 is_mesh)
+                     u32 *KeyContent)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        struct rtllib_device *ieee = priv->rtllib;
@@ -58,14 +58,12 @@ void rtl92e_set_swcam(struct net_device *dev, u8 EntryNo, u8 KeyIndex,
        if (EntryNo >= TOTAL_CAM_ENTRY)
                return;
 
-       if (!is_mesh) {
-               ieee->swcamtable[EntryNo].bused = true;
-               ieee->swcamtable[EntryNo].key_index = KeyIndex;
-               ieee->swcamtable[EntryNo].key_type = KeyType;
-               memcpy(ieee->swcamtable[EntryNo].macaddr, MacAddr, 6);
-               ieee->swcamtable[EntryNo].useDK = DefaultKey;
-               memcpy(ieee->swcamtable[EntryNo].key_buf, (u8 *)KeyContent, 16);
-       }
+       ieee->swcamtable[EntryNo].bused = true;
+       ieee->swcamtable[EntryNo].key_index = KeyIndex;
+       ieee->swcamtable[EntryNo].key_type = KeyType;
+       memcpy(ieee->swcamtable[EntryNo].macaddr, MacAddr, 6);
+       ieee->swcamtable[EntryNo].useDK = DefaultKey;
+       memcpy(ieee->swcamtable[EntryNo].key_buf, (u8 *)KeyContent, 16);
 }
 
 void rtl92e_set_key(struct net_device *dev, u8 EntryNo, u8 KeyIndex,

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h
index 1ebd92e..fcfde5f 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h
@@ -20,7 +20,7 @@ void rtl92e_set_key(struct net_device *dev, u8 EntryNo, u8 KeyIndex,
                    u32 *KeyContent);
 void rtl92e_set_swcam(struct net_device *dev, u8 EntryNo, u8 KeyIndex,
                      u16 KeyType, const u8 *MacAddr, u8 DefaultKey,
-                     u32 *KeyContent, u8 is_mesh);
+                     u32 *KeyContent);
 void rtl92e_cam_restore(struct net_device *dev);
 
 #endif

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
index 7474734..644762f 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
@@ -712,7 +712,7 @@ static int _rtl92e_wx_set_enc(struct net_device *dev,
                        rtl92e_set_key(dev, key_idx, key_idx, KEY_TYPE_WEP104,
                                       zero_addr[key_idx], 0, hwkey);
                        rtl92e_set_swcam(dev, key_idx, key_idx, KEY_TYPE_WEP104,
-                                        zero_addr[key_idx], 0, hwkey, 0);
+                                        zero_addr[key_idx], 0, hwkey);
                } else {
                        netdev_info(dev,
                                    "wrong type in WEP, not WEP40 and WEP104\n");
@@ -857,21 +857,19 @@ static int _rtl92e_wx_set_encode_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);
-                       rtl92e_set_swcam(dev, idx, idx, alg, zero, 0, key, 0);
+                       rtl92e_set_swcam(dev, idx, idx, alg, zero, 0, key);
                } else if (group) {
                        ieee->group_key_type = alg;
                        rtl92e_set_key(dev, idx, idx, alg, broadcast_addr, 0,
                                       key);
-                       rtl92e_set_swcam(dev, idx, idx, alg, broadcast_addr, 0,
-                                        key, 0);
+                       rtl92e_set_swcam(dev, idx, idx, alg, broadcast_addr, 0, key);
                } else {
                        if ((ieee->pairwise_key_type == KEY_TYPE_CCMP) &&
                             ieee->ht_info->bCurrentHTSupport)
                                rtl92e_writeb(dev, 0x173, 1);
                        rtl92e_set_key(dev, 4, idx, alg,
                                       (u8 *)ieee->ap_mac_addr, 0, key);
-                       rtl92e_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);
                }
        }