staging: rtl8192e: Remove DefaultKey from rtl92e_set_swcam

Function rtl92e_set_swcam() has parameter DefaultKey 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/9390014fe045028ac2a32ce7c9745c7cddbd4adf.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 f9ddb8384752deb85786bb17b609da2523ac812e..944cc73fb2b69090de4871647b0f38c4ce3e067c 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
@@ -49,8 +49,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)
+                     u16 KeyType, const u8 *MacAddr, u32 *KeyContent)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        struct rtllib_device *ieee = priv->rtllib;
@@ -62,7 +61,7 @@ void rtl92e_set_swcam(struct net_device *dev, u8 EntryNo, u8 KeyIndex,
        ieee->swcamtable[EntryNo].key_index = KeyIndex;
        ieee->swcamtable[EntryNo].key_type = KeyType;
        memcpy(ieee->swcamtable[EntryNo].macaddr, MacAddr, 6);
-       ieee->swcamtable[EntryNo].useDK = DefaultKey;
+       ieee->swcamtable[EntryNo].useDK = 0;
        memcpy(ieee->swcamtable[EntryNo].key_buf, (u8 *)KeyContent, 16);
 }
 

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h
index fcfde5f6cf2fb242cc68e0fe4963ea3860fbc94b..bd33ef1051072debba51a1616a985d83d94592c8 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h
@@ -19,8 +19,7 @@ void rtl92e_set_key(struct net_device *dev, u8 EntryNo, u8 KeyIndex,
                    u16 KeyType, const u8 *MacAddr, u8 DefaultKey,
                    u32 *KeyContent);
 void rtl92e_set_swcam(struct net_device *dev, u8 EntryNo, u8 KeyIndex,
-                     u16 KeyType, const u8 *MacAddr, u8 DefaultKey,
-                     u32 *KeyContent);
+                     u16 KeyType, const u8 *MacAddr, 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 644762f925b7f3ff61443a8bbb8e9719ccaac0d4..1897988525686a422fc825b07f279b38d930ca29 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);
+                                        zero_addr[key_idx], hwkey);
                } else {
                        netdev_info(dev,
                                    "wrong type in WEP, not WEP40 and WEP104\n");
@@ -857,19 +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);
+                       rtl92e_set_swcam(dev, idx, idx, alg, zero, 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);
+                       rtl92e_set_swcam(dev, idx, idx, alg, broadcast_addr, 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);
+                       rtl92e_set_swcam(dev, 4, idx, alg, (u8 *)ieee->ap_mac_addr, key);
                }
        }