Skip to contentSkip to conversation

staging: rtl8192e: Remove unused variables starting with p_intb

PATCH New Philipp Hortmann 1 participant 11 messages Jul 29, 2023 Staging

lore
Share & tools
lore

Philipp Hortmann

author
#0 lore raw

cover staging: rtl8192e: Remove unused variables starting with p_intb

Remove unused or constant variables and empty functions.

Tested with rtl8192e (WLL6130-D99) in Mode n (12.5 MB/s) Transferred this patch over wlan connection of rtl8192e.

Philipp Hortmann (10):
staging: rtl8192e: Remove unused variable p_intb
staging: rtl8192e: Remove unused variable intb in _rtl92e_irq()
staging: rtl8192e: Remove empty function rtllib_rx_Master()
staging: rtl8192e: Remove empty function rtllib_rx_Mesh()
staging: rtl8192e: Remove unused variable is_mesh from
rtllib_send_probe
staging: rtl8192e: Remove is_mesh from rtllib_send_probe_requests
staging: rtl8192e: Remove is_mesh from rtllib_start_scan_syncro
staging: rtl8192e: Remove is_mesh from rtllib_softmac_scan_syncro
staging: rtl8192e: Remove is_mesh from rtl92e_set_swcam
staging: rtl8192e: Remove DefaultKey from rtl92e_set_swcam

 .../staging/rtl8192e/rtl8192e/r8192E_dev.c    |  2 +-
 .../staging/rtl8192e/rtl8192e/r8192E_dev.h    |  2 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_cam.c   | 17 +++++++---------
 drivers/staging/rtl8192e/rtl8192e/rtl_cam.h   |  3 +--
 drivers/staging/rtl8192e/rtl8192e/rtl_core.c  |  5 +----
 drivers/staging/rtl8192e/rtl8192e/rtl_wx.c    | 12 +++++------
 drivers/staging/rtl8192e/rtllib.h             |  2 +-
 drivers/staging/rtl8192e/rtllib_rx.c          | 14 -------------
 drivers/staging/rtl8192e/rtllib_softmac.c     | 20 +++++++++----------
 drivers/staging/rtl8192e/rtllib_softmac_wx.c  |  4 ++--
 10 files changed, 29 insertions(+), 52 deletions(-)
Signature · 1 line
2.41.0
author
#1 lore raw

PATCH 1/10 staging: rtl8192e: Remove unused variable p_intb

Remove unused variable p_intb of rtl92e_ack_irq.

Signed-off-by Philipp Hortmann <[email protected]>
---
 drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +-
 drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h | 2 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_core.c   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +1 -1
index 5ac6af7e3a79..5bfd84b08dd9 100644
@@ -1912,7 +1912,7 @@ void rtl92e_enable_tx(struct net_device *dev)
 		rtl92e_writel(dev, TX_DESC_BASE[i], priv->tx_ring[i].dma);
 }
 
-void rtl92e_ack_irq(struct net_device *dev, u32 *p_inta, u32 *p_intb)
+void rtl92e_ack_irq(struct net_device *dev, u32 *p_inta)
 {
 	*p_inta = rtl92e_readl(dev, ISR);
 	rtl92e_writel(dev, ISR, *p_inta);
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h +1 -1
index fa3b71dbb091..11366fda4ec3 100644
@@ -13,7 +13,7 @@ bool rtl92e_is_halfn_supported_by_ap(struct net_device *dev);
 bool rtl92e_get_nmode_support_by_sec(struct net_device *dev);
 bool rtl92e_is_tx_stuck(struct net_device *dev);
 bool rtl92e_is_rx_stuck(struct net_device *dev);
-void rtl92e_ack_irq(struct net_device *dev, u32 *p_inta, u32 *p_intb);
+void rtl92e_ack_irq(struct net_device *dev, u32 *p_inta);
 void rtl92e_enable_rx(struct net_device *dev);
 void rtl92e_enable_tx(struct net_device *dev);
 void rtl92e_enable_irq(struct net_device *dev);
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +1 -1
index aaff8d739efe..cfad170008c6 100644
@@ -1982,7 +1982,7 @@ static irqreturn_t _rtl92e_irq(int irq, void *netdev)
 
 	spin_lock_irqsave(&priv->irq_th_lock, flags);
 
-	rtl92e_ack_irq(dev, &inta, &intb);
+	rtl92e_ack_irq(dev, &inta);
 
 	if (!inta) {
 		spin_unlock_irqrestore(&priv->irq_th_lock, flags);
Signature · 1 line
2.41.0
author
#2 lore raw

PATCH 2/10 staging: rtl8192e: Remove unused variable intb in _rtl92e_irq()

In reply to Philipp Hortmann

Remove unused variable intb in _rtl92e_irq().

Signed-off-by Philipp Hortmann <[email protected]>
---
 drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +0 -3
index cfad170008c6..50eb8f3494ec 100644
@@ -1973,9 +1973,6 @@ static irqreturn_t _rtl92e_irq(int irq, void *netdev)
 	struct r8192_priv *priv = rtllib_priv(dev);
 	unsigned long flags;
 	u32 inta;
-	u32 intb;
-
-	intb = 0;
 
 	if (priv->irq_enabled == 0)
 		goto done;
Signature · 1 line
2.41.0
author
#3 lore raw

PATCH 3/10 staging: rtl8192e: Remove empty function rtllib_rx_Master()

In reply to Philipp Hortmann

Function rtllib_rx_Master() returns always 0. Variable ret is already initialized with 0. Remove dead code.

Signed-off-by Philipp Hortmann <[email protected]>
---
 drivers/staging/rtl8192e/rtllib_rx.c | 7 -------
 1 file changed, 7 deletions(-)
drivers/staging/rtl8192e/rtllib_rx.c +0 -7
index 195ce0fecd29..b9d220b015f6 100644
@@ -1445,12 +1445,6 @@ static int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb,
 	return 0;
 }
 
-static int rtllib_rx_Master(struct rtllib_device *ieee, struct sk_buff *skb,
-		 struct rtllib_rx_stats *rx_stats)
-{
-	return 0;
-}
-
 static int rtllib_rx_Monitor(struct rtllib_device *ieee, struct sk_buff *skb,
 		 struct rtllib_rx_stats *rx_stats)
 {

@@ -1510,7 +1504,6 @@ int rtllib_rx(struct rtllib_device *ieee, struct sk_buff *skb,
 		break;
 	case IW_MODE_MASTER:
 	case IW_MODE_REPEAT:
-		ret = rtllib_rx_Master(ieee, skb, rx_stats);
 		break;
 	case IW_MODE_MONITOR:
 		ret = rtllib_rx_Monitor(ieee, skb, rx_stats);
Signature · 1 line
2.41.0
author
#4 lore raw

PATCH 4/10 staging: rtl8192e: Remove empty function rtllib_rx_Mesh()

In reply to Philipp Hortmann

Function rtllib_rx_Mesh() returns always 0. Variable ret is already initialized with 0. Remove dead code.

Signed-off-by Philipp Hortmann <[email protected]>
---
 drivers/staging/rtl8192e/rtllib_rx.c | 7 -------
 1 file changed, 7 deletions(-)
drivers/staging/rtl8192e/rtllib_rx.c +0 -7
index b9d220b015f6..8a4029f26835 100644
@@ -1473,12 +1473,6 @@ static int rtllib_rx_Monitor(struct rtllib_device *ieee, struct sk_buff *skb,
 	return 1;
 }
 
-static int rtllib_rx_Mesh(struct rtllib_device *ieee, struct sk_buff *skb,
-		 struct rtllib_rx_stats *rx_stats)
-{
-	return 0;
-}
-
 /* All received frames are sent to this function. @skb contains the frame in
  * IEEE 802.11 format, i.e., in the format it was sent over air.
  * This function is called only as a tasklet (software IRQ).

@@ -1509,7 +1503,6 @@ int rtllib_rx(struct rtllib_device *ieee, struct sk_buff *skb,
 		ret = rtllib_rx_Monitor(ieee, skb, rx_stats);
 		break;
 	case IW_MODE_MESH:
-		ret = rtllib_rx_Mesh(ieee, skb, rx_stats);
 		break;
 	default:
 		netdev_info(ieee->dev, "%s: ERR iw mode!!!\n", __func__);
Signature · 1 line
2.41.0
author
#5 lore raw

PATCH 5/10 staging: rtl8192e: Remove unused variable is_mesh from rtllib_send_probe

In reply to Philipp Hortmann

Function rtllib_send_probe() has unused parameter is_mesh. Remove dead code.

Signed-off-by Philipp Hortmann <[email protected]>
---
 drivers/staging/rtl8192e/rtllib_softmac.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8192e/rtllib_softmac.c +3 -3
index 584371f0ce57..06b872c1ad68 100644
@@ -449,7 +449,7 @@ void rtllib_DisableIntelPromiscuousMode(struct net_device *dev,
 }
 EXPORT_SYMBOL(rtllib_DisableIntelPromiscuousMode);
 
-static void rtllib_send_probe(struct rtllib_device *ieee, u8 is_mesh)
+static void rtllib_send_probe(struct rtllib_device *ieee)
 {
 	struct sk_buff *skb;
 

@@ -464,8 +464,8 @@ static void rtllib_send_probe_requests(struct rtllib_device *ieee, u8 is_mesh)
 {
 	if (ieee->active_scan && (ieee->softmac_features &
 	    IEEE_SOFTMAC_PROBERQ)) {
-		rtllib_send_probe(ieee, 0);
-		rtllib_send_probe(ieee, 0);
+		rtllib_send_probe(ieee);
+		rtllib_send_probe(ieee);
 	}
 }
Signature · 1 line
2.41.0
author
#6 lore raw

PATCH 6/10 staging: rtl8192e: Remove is_mesh from rtllib_send_probe_requests

In reply to Philipp Hortmann

Function rtllib_send_probe_requests() has unused parameter is_mesh. Remove dead code.

Signed-off-by Philipp Hortmann <[email protected]>
---
 drivers/staging/rtl8192e/rtllib_softmac.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8192e/rtllib_softmac.c +3 -3
index 06b872c1ad68..614f19603af1 100644
@@ -460,7 +460,7 @@ static void rtllib_send_probe(struct rtllib_device *ieee)
 	}
 }
 
-static void rtllib_send_probe_requests(struct rtllib_device *ieee, u8 is_mesh)
+static void rtllib_send_probe_requests(struct rtllib_device *ieee)
 {
 	if (ieee->active_scan && (ieee->softmac_features &
 	    IEEE_SOFTMAC_PROBERQ)) {

@@ -525,7 +525,7 @@ static void rtllib_softmac_scan_syncro(struct rtllib_device *ieee, u8 is_mesh)
 
 		ieee->set_chan(ieee->dev, ch);
 		if (ieee->active_channel_map[ch] == 1)
-			rtllib_send_probe_requests(ieee, 0);
+			rtllib_send_probe_requests(ieee);
 
 		/* this prevent excessive time wait when we
 		 * need to wait for a syncro scan to end..

@@ -587,7 +587,7 @@ static void rtllib_softmac_scan_wq(void *data)
 	ieee->set_chan(ieee->dev, ieee->current_network.channel);
 
 	if (ieee->active_channel_map[ieee->current_network.channel] == 1)
-		rtllib_send_probe_requests(ieee, 0);
+		rtllib_send_probe_requests(ieee);
 
 	schedule_delayed_work(&ieee->softmac_scan_wq,
 			      msecs_to_jiffies(RTLLIB_SOFTMAC_SCAN_TIME));
Signature · 1 line
2.41.0
author
#7 lore raw

PATCH 7/10 staging: rtl8192e: Remove is_mesh from rtllib_start_scan_syncro

In reply to Philipp Hortmann

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

Signed-off-by Philipp Hortmann <[email protected]>
---
 drivers/staging/rtl8192e/rtl8192e/rtl_wx.c   | 2 +-
 drivers/staging/rtl8192e/rtllib.h            | 2 +-
 drivers/staging/rtl8192e/rtllib_softmac.c    | 6 +++---
 drivers/staging/rtl8192e/rtllib_softmac_wx.c | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +1 -1
index 88975dc804c6..74747348b573 100644
@@ -428,7 +428,7 @@ static int _rtl92e_wx_set_scan(struct net_device *dev,
 
 			ieee->ScanOperationBackupHandler(ieee->dev, SCAN_OPT_BACKUP);
 
-			rtllib_start_scan_syncro(priv->rtllib, 0);
+			rtllib_start_scan_syncro(priv->rtllib);
 
 			ieee->ScanOperationBackupHandler(ieee->dev, SCAN_OPT_RESTORE);
 		}
drivers/staging/rtl8192e/rtllib.h +1 -1
index aa8abec390ca..9603a3485868 100644
@@ -1887,7 +1887,7 @@ void rtllib_disassociate(struct rtllib_device *ieee);
 void rtllib_stop_scan(struct rtllib_device *ieee);
 bool rtllib_act_scanning(struct rtllib_device *ieee, bool sync_scan);
 void rtllib_stop_scan_syncro(struct rtllib_device *ieee);
-void rtllib_start_scan_syncro(struct rtllib_device *ieee, u8 is_mesh);
+void rtllib_start_scan_syncro(struct rtllib_device *ieee);
 void rtllib_sta_ps_send_null_frame(struct rtllib_device *ieee, short pwr);
 void rtllib_sta_ps_send_pspoll_frame(struct rtllib_device *ieee);
 void rtllib_start_protocol(struct rtllib_device *ieee);
drivers/staging/rtl8192e/rtllib_softmac.c +3 -3
index 614f19603af1..7b866b3a46ef 100644
@@ -707,7 +707,7 @@ static void rtllib_start_scan(struct rtllib_device *ieee)
 }
 
 /* called with wx_mutex held */
-void rtllib_start_scan_syncro(struct rtllib_device *ieee, u8 is_mesh)
+void rtllib_start_scan_syncro(struct rtllib_device *ieee)
 {
 	if (IS_DOT11D_ENABLE(ieee)) {
 		if (IS_COUNTRY_IE_VALID(ieee))

@@ -715,7 +715,7 @@ void rtllib_start_scan_syncro(struct rtllib_device *ieee, u8 is_mesh)
 	}
 	ieee->sync_scan_hurryup = 0;
 	if (ieee->softmac_features & IEEE_SOFTMAC_SCAN)
-		rtllib_softmac_scan_syncro(ieee, is_mesh);
+		rtllib_softmac_scan_syncro(ieee, 0);
 }
 EXPORT_SYMBOL(rtllib_start_scan_syncro);
 

@@ -2500,7 +2500,7 @@ static void rtllib_start_ibss_wq(void *data)
 	 * associated.
 	 */
 	if (ieee->link_state == MAC80211_NOLINK)
-		rtllib_start_scan_syncro(ieee, 0);
+		rtllib_start_scan_syncro(ieee);
 
 	/* the network definitively is not here.. create a new cell */
 	if (ieee->link_state == MAC80211_NOLINK) {
drivers/staging/rtl8192e/rtllib_softmac_wx.c +2 -2
index 1a7575ab9d6d..aad91dad134c 100644
@@ -310,7 +310,7 @@ void rtllib_wx_sync_scan_wq(void *data)
 
 	mutex_lock(&ieee->wx_mutex);
 	if (!(ieee->softmac_features & IEEE_SOFTMAC_SCAN)) {
-		rtllib_start_scan_syncro(ieee, 0);
+		rtllib_start_scan_syncro(ieee);
 		goto out;
 	}
 

@@ -339,7 +339,7 @@ void rtllib_wx_sync_scan_wq(void *data)
 				       HT_EXTCHNL_OFFSET_NO_EXT);
 	}
 
-	rtllib_start_scan_syncro(ieee, 0);
+	rtllib_start_scan_syncro(ieee);
 
 	if (b40M) {
 		if (chan_offset == HT_EXTCHNL_OFFSET_UPPER)
Signature · 1 line
2.41.0
author
#8 lore raw

PATCH 8/10 staging: rtl8192e: Remove is_mesh from rtllib_softmac_scan_syncro

In reply to Philipp Hortmann

Function rtllib_softmac_scan_syncro() has unused parameter is_mesh. Remove dead code.

Signed-off-by Philipp Hortmann <[email protected]>
---
 drivers/staging/rtl8192e/rtllib_softmac.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8192e/rtllib_softmac.c +2 -2
index 7b866b3a46ef..0e52b207942d 100644
@@ -478,7 +478,7 @@ static void rtllib_update_active_chan_map(struct rtllib_device *ieee)
 /* this performs syncro scan blocking the caller until all channels
  * in the allowed channel map has been checked.
  */
-static void rtllib_softmac_scan_syncro(struct rtllib_device *ieee, u8 is_mesh)
+static void rtllib_softmac_scan_syncro(struct rtllib_device *ieee)
 {
 	union iwreq_data wrqu;
 	short ch = 0;

@@ -715,7 +715,7 @@ void rtllib_start_scan_syncro(struct rtllib_device *ieee)
 	}
 	ieee->sync_scan_hurryup = 0;
 	if (ieee->softmac_features & IEEE_SOFTMAC_SCAN)
-		rtllib_softmac_scan_syncro(ieee, 0);
+		rtllib_softmac_scan_syncro(ieee);
 }
 EXPORT_SYMBOL(rtllib_start_scan_syncro);
Signature · 1 line
2.41.0
author
#9 lore raw

PATCH 9/10 staging: rtl8192e: Remove is_mesh from rtl92e_set_swcam

In reply to Philipp Hortmann

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

Signed-off-by Philipp Hortmann <[email protected]>
---
 drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 16 +++++++---------
 drivers/staging/rtl8192e/rtl8192e/rtl_cam.h |  2 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_wx.c  | 10 ++++------
 3 files changed, 12 insertions(+), 16 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_cam.c +7 -9
index 6d9e5c27017d..f9ddb8384752 100644
@@ -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,
drivers/staging/rtl8192e/rtl8192e/rtl_cam.h +1 -1
index 1ebd92e27441..fcfde5f6cf2f 100644
@@ -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
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +4 -6
index 74747348b573..644762f925b7 100644
@@ -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);
 		}
 	}
Signature · 1 line
2.41.0
author
#10 lore raw

PATCH 10/10 staging: rtl8192e: Remove DefaultKey from rtl92e_set_swcam

In reply to Philipp Hortmann

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

Signed-off-by Philipp Hortmann <[email protected]>
---
 drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 5 ++---
 drivers/staging/rtl8192e/rtl8192e/rtl_cam.h | 3 +--
 drivers/staging/rtl8192e/rtl8192e/rtl_wx.c  | 8 ++++----
 3 files changed, 7 insertions(+), 9 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_cam.c +2 -3
index f9ddb8384752..944cc73fb2b6 100644
@@ -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);
 }
drivers/staging/rtl8192e/rtl8192e/rtl_cam.h +1 -2
index fcfde5f6cf2f..bd33ef105107 100644
@@ -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
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +4 -4
index 644762f925b7..189798852568 100644
@@ -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);
 		}
 	}
Signature · 1 line
2.41.0