Skip to contentSkip to conversation

staging: rtl8192e: Remove timer function TsSetupTimeOut

PATCH New Philipp Hortmann 1 participant 12 messages Jun 24, 2023 Staging

lore
Share & tools
lore

Philipp Hortmann

author
#0 lore raw

cover staging: rtl8192e: Remove timer function TsSetupTimeOut

Remove unchanged or unused variables and code.

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

Philipp Hortmann (11):
staging: rtl8192e: Remove unused timer SetupTimer
staging: rtl8192e: Remove equation of local variable InactTime of
AdmitTS
staging: rtl8192e: Remove unused timer InactTimer
staging: rtl8192e: Remove empty function AdmitTS
staging: rtl8192e: Remove variable modulation as it is constant
staging: rtl8192e: Remove variable host_encrypt as it is constant
staging: rtl8192e: Remove variable host_decrypt as it is constant
staging: rtl8192e: Remove variable card_type
staging: rtl8192e: Remove variable bdisable_nic
staging: rtl8192e: Remove variable priv->reg_chnl_plan
staging: rtl8192e: Remove variable ieee->short_slot

 .../staging/rtl8192e/rtl8192e/r8192E_dev.c    |   5 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_core.c  |  20 ---
 drivers/staging/rtl8192e/rtl8192e/rtl_core.h  |   8 -
 drivers/staging/rtl8192e/rtl819x_TS.h         |   2 -
 drivers/staging/rtl8192e/rtl819x_TSProc.c     |  35 -----
 drivers/staging/rtl8192e/rtllib.h             |   6 -
 drivers/staging/rtl8192e/rtllib_module.c      |   3 -
 drivers/staging/rtl8192e/rtllib_rx.c          |  44 +++---
 drivers/staging/rtl8192e/rtllib_softmac.c     | 143 +++++++-----------
 drivers/staging/rtl8192e/rtllib_softmac_wx.c  |   4 +-
 drivers/staging/rtl8192e/rtllib_tx.c          |   3 +-
 11 files changed, 80 insertions(+), 193 deletions(-)
Signature · 1 line
2.41.0
author
#1 lore raw

PATCH 1/11 staging: rtl8192e: Remove unused timer SetupTimer

Remove unused timer SetupTimer and all the resulting unused code.

Signed-off-by Philipp Hortmann <[email protected]>
---
 drivers/staging/rtl8192e/rtl819x_TS.h     |  1 -
 drivers/staging/rtl8192e/rtl819x_TSProc.c | 12 ------------
 2 files changed, 13 deletions(-)
drivers/staging/rtl8192e/rtl819x_TS.h +0 -1
index 37760d0bc35d..75ee2056d361 100644
@@ -19,7 +19,6 @@ enum tr_select {
 
 struct ts_common_info {
 	struct list_head		List;
-	struct timer_list		SetupTimer;
 	struct timer_list		InactTimer;
 	u8				Addr[ETH_ALEN];
 	union tspec_body TSpec;
drivers/staging/rtl8192e/rtl819x_TSProc.c +0 -12
index c61fdf73c572..00f6a66c2265 100644
@@ -8,10 +8,6 @@
 #include <linux/etherdevice.h>
 #include "rtl819x_TS.h"
 
-static void TsSetupTimeOut(struct timer_list *unused)
-{
-}
-
 static void TsInactTimeout(struct timer_list *unused)
 {
 }

@@ -142,9 +138,6 @@ void TSInitialize(struct rtllib_device *ieee)
 
 	for (count = 0; count < TOTAL_TS_NUM; count++) {
 		pTxTS->num = count;
-		timer_setup(&pTxTS->TsCommonInfo.SetupTimer, TsSetupTimeOut,
-			    0);
-
 		timer_setup(&pTxTS->TsCommonInfo.InactTimer, TsInactTimeout,
 			    0);
 

@@ -168,9 +161,6 @@ void TSInitialize(struct rtllib_device *ieee)
 		pRxTS->num = count;
 		INIT_LIST_HEAD(&pRxTS->rx_pending_pkt_list);
 
-		timer_setup(&pRxTS->ts_common_info.SetupTimer, TsSetupTimeOut,
-			    0);
-
 		timer_setup(&pRxTS->ts_common_info.InactTimer, TsInactTimeout,
 			    0);
 

@@ -197,7 +187,6 @@ void TSInitialize(struct rtllib_device *ieee)
 static void AdmitTS(struct rtllib_device *ieee,
 		    struct ts_common_info *pTsCommonInfo, u32 InactTime)
 {
-	del_timer_sync(&pTsCommonInfo->SetupTimer);
 	del_timer_sync(&pTsCommonInfo->InactTimer);
 
 	if (InactTime != 0)

@@ -394,7 +383,6 @@ bool GetTs(struct rtllib_device *ieee, struct ts_common_info **ppTS,
 static void RemoveTsEntry(struct rtllib_device *ieee,
 			  struct ts_common_info *pTs, enum tr_select TxRxSelect)
 {
-	del_timer_sync(&pTs->SetupTimer);
 	del_timer_sync(&pTs->InactTimer);
 	TsInitDelBA(ieee, pTs, TxRxSelect);
Signature · 1 line
2.41.0
author
#2 lore raw

PATCH 2/11 staging: rtl8192e: Remove equation of local variable InactTime of AdmitTS

In reply to Philipp Hortmann

Remove equation of local variable InactTime of AdmitTS as AdmitTS is only once called with InactTime as 0. The equation is always false and therefore dead code.

Signed-off-by Philipp Hortmann <[email protected]>
---
 drivers/staging/rtl8192e/rtl819x_TSProc.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/staging/rtl8192e/rtl819x_TSProc.c +0 -4
index 00f6a66c2265..ed124f85c2b1 100644
@@ -188,10 +188,6 @@ static void AdmitTS(struct rtllib_device *ieee,
 		    struct ts_common_info *pTsCommonInfo, u32 InactTime)
 {
 	del_timer_sync(&pTsCommonInfo->InactTimer);
-
-	if (InactTime != 0)
-		mod_timer(&pTsCommonInfo->InactTimer, jiffies +
-			  msecs_to_jiffies(InactTime));
 }
 
 static struct ts_common_info *SearchAdmitTRStream(struct rtllib_device *ieee,
Signature · 1 line
2.41.0
author
#3 lore raw

PATCH 3/11 staging: rtl8192e: Remove unused timer InactTimer

In reply to Philipp Hortmann

Remove unused timer InactTimer and all the resulting unused code.

Signed-off-by Philipp Hortmann <[email protected]>
---
 drivers/staging/rtl8192e/rtl819x_TS.h     |  1 -
 drivers/staging/rtl8192e/rtl819x_TSProc.c | 13 -------------
 2 files changed, 14 deletions(-)
drivers/staging/rtl8192e/rtl819x_TS.h +0 -1
index 75ee2056d361..0e851d4221a7 100644
@@ -19,7 +19,6 @@ enum tr_select {
 
 struct ts_common_info {
 	struct list_head		List;
-	struct timer_list		InactTimer;
 	u8				Addr[ETH_ALEN];
 	union tspec_body TSpec;
 	union qos_tclas TClass[TCLAS_NUM];
drivers/staging/rtl8192e/rtl819x_TSProc.c +0 -13
index ed124f85c2b1..7fff20b185f0 100644
@@ -8,10 +8,6 @@
 #include <linux/etherdevice.h>
 #include "rtl819x_TS.h"
 
-static void TsInactTimeout(struct timer_list *unused)
-{
-}
-
 static void RxPktPendingTimeout(struct timer_list *t)
 {
 	struct rx_ts_record *pRxTs = from_timer(pRxTs, t,

@@ -138,9 +134,6 @@ void TSInitialize(struct rtllib_device *ieee)
 
 	for (count = 0; count < TOTAL_TS_NUM; count++) {
 		pTxTS->num = count;
-		timer_setup(&pTxTS->TsCommonInfo.InactTimer, TsInactTimeout,
-			    0);
-
 		timer_setup(&pTxTS->TsAddBaTimer, TsAddBaProcess, 0);
 
 		timer_setup(&pTxTS->TxPendingBARecord.timer, BaSetupTimeOut,

@@ -160,10 +153,6 @@ void TSInitialize(struct rtllib_device *ieee)
 	for (count = 0; count < TOTAL_TS_NUM; count++) {
 		pRxTS->num = count;
 		INIT_LIST_HEAD(&pRxTS->rx_pending_pkt_list);
-
-		timer_setup(&pRxTS->ts_common_info.InactTimer, TsInactTimeout,
-			    0);
-
 		timer_setup(&pRxTS->rx_admitted_ba_record.timer,
 			    RxBaInactTimeout, 0);
 

@@ -187,7 +176,6 @@ void TSInitialize(struct rtllib_device *ieee)
 static void AdmitTS(struct rtllib_device *ieee,
 		    struct ts_common_info *pTsCommonInfo, u32 InactTime)
 {
-	del_timer_sync(&pTsCommonInfo->InactTimer);
 }
 
 static struct ts_common_info *SearchAdmitTRStream(struct rtllib_device *ieee,

@@ -379,7 +367,6 @@ bool GetTs(struct rtllib_device *ieee, struct ts_common_info **ppTS,
 static void RemoveTsEntry(struct rtllib_device *ieee,
 			  struct ts_common_info *pTs, enum tr_select TxRxSelect)
 {
-	del_timer_sync(&pTs->InactTimer);
 	TsInitDelBA(ieee, pTs, TxRxSelect);
 
 	if (TxRxSelect == RX_DIR) {
Signature · 1 line
2.41.0
author
#4 lore raw

PATCH 4/11 staging: rtl8192e: Remove empty function AdmitTS

In reply to Philipp Hortmann

Remove call of function and empty function AdmitTS.

Signed-off-by Philipp Hortmann <[email protected]>
---
 drivers/staging/rtl8192e/rtl819x_TSProc.c | 6 ------
 1 file changed, 6 deletions(-)
drivers/staging/rtl8192e/rtl819x_TSProc.c +0 -6
index 7fff20b185f0..474171edb2f9 100644
@@ -173,11 +173,6 @@ void TSInitialize(struct rtllib_device *ieee)
 	}
 }
 
-static void AdmitTS(struct rtllib_device *ieee,
-		    struct ts_common_info *pTsCommonInfo, u32 InactTime)
-{
-}
-
 static struct ts_common_info *SearchAdmitTRStream(struct rtllib_device *ieee,
 						  u8 *Addr, u8 TID,
 						  enum tr_select TxRxSelect)

@@ -352,7 +347,6 @@ bool GetTs(struct rtllib_device *ieee, struct ts_common_info **ppTS,
 		pTSInfo->field.ucSchedule = 0;
 
 		MakeTSEntry(*ppTS, Addr, &TSpec, NULL, 0, 0);
-		AdmitTS(ieee, *ppTS, 0);
 		list_add_tail(&((*ppTS)->List), pAddmitList);
 
 		return true;
Signature · 1 line
2.41.0
author
#5 lore raw

PATCH 5/11 staging: rtl8192e: Remove variable modulation as it is constant

In reply to Philipp Hortmann

ieee->modulation is initialized to 3 and then unchanged. All evaluations will result accordingly. Remove resulting dead code.

Signed-off-by Philipp Hortmann <[email protected]>
---
 drivers/staging/rtl8192e/rtl8192e/rtl_core.c |   2 -
 drivers/staging/rtl8192e/rtllib.h            |   1 -
 drivers/staging/rtl8192e/rtllib_softmac.c    | 121 ++++++++-----------
 drivers/staging/rtl8192e/rtllib_softmac_wx.c |   4 +-
 4 files changed, 50 insertions(+), 78 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +0 -2
index 4447489a16ea..cb0753f6fb18 100644
@@ -804,8 +804,6 @@ static void _rtl92e_init_priv_variable(struct net_device *dev)
 	priv->rtllib->iw_mode = IW_MODE_INFRA;
 	priv->rtllib->active_scan = 1;
 	priv->rtllib->be_scan_inprogress = false;
-	priv->rtllib->modulation = RTLLIB_CCK_MODULATION |
-				   RTLLIB_OFDM_MODULATION;
 	priv->rtllib->host_encrypt = 1;
 	priv->rtllib->host_decrypt = 1;
drivers/staging/rtl8192e/rtllib.h +0 -1
index e3ce4431d460..fdb7990130b5 100644
@@ -1492,7 +1492,6 @@ struct rtllib_device {
 
 	int short_slot;
 	int mode;       /* A, B, G */
-	int modulation; /* CCK, OFDM */
 
 	/* used for forcing the ibss workqueue to terminate
 	 * without wait for the syncro scan to terminate
drivers/staging/rtl8192e/rtllib_softmac.c +49 -72

157 lines not on this page · raw message

drivers/staging/rtl8192e/rtllib_softmac_wx.c +1 -3
index 2de63d1f2009..1a7575ab9d6d 100644
@@ -487,11 +487,9 @@ EXPORT_SYMBOL(rtllib_wx_set_rawtx);
 int rtllib_wx_get_name(struct rtllib_device *ieee, struct iw_request_info *info,
 		       union iwreq_data *wrqu, char *extra)
 {
-	const char *b = ieee->modulation & RTLLIB_CCK_MODULATION ? "b" : "";
-	const char *g = ieee->modulation & RTLLIB_OFDM_MODULATION ? "g" : "";
 	const char *n = ieee->mode & (WIRELESS_MODE_N_24G) ? "n" : "";
 
-	scnprintf(wrqu->name, sizeof(wrqu->name), "802.11%s%s%s", b, g, n);
+	scnprintf(wrqu->name, sizeof(wrqu->name), "802.11bg%s", n);
 	return 0;
 }
 EXPORT_SYMBOL(rtllib_wx_get_name);
Signature · 1 line
2.41.0
author
#6 lore raw

PATCH 6/11 staging: rtl8192e: Remove variable host_encrypt as it is constant

In reply to Philipp Hortmann

ieee->host_encrypt also named priv->rtllib->host_encrypt is initialized to 1 and then unchanged. All evaluations will result accordingly. Remove resulting dead code.

Signed-off-by Philipp Hortmann <[email protected]>
---
 drivers/staging/rtl8192e/rtl8192e/rtl_core.c |  1 -
 drivers/staging/rtl8192e/rtllib.h            |  1 -
 drivers/staging/rtl8192e/rtllib_module.c     |  1 -
 drivers/staging/rtl8192e/rtllib_softmac.c    | 12 ++++--------
 drivers/staging/rtl8192e/rtllib_tx.c         |  3 +--
 5 files changed, 5 insertions(+), 13 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +0 -1
index cb0753f6fb18..838b9c8b0df7 100644
@@ -804,7 +804,6 @@ static void _rtl92e_init_priv_variable(struct net_device *dev)
 	priv->rtllib->iw_mode = IW_MODE_INFRA;
 	priv->rtllib->active_scan = 1;
 	priv->rtllib->be_scan_inprogress = false;
-	priv->rtllib->host_encrypt = 1;
 	priv->rtllib->host_decrypt = 1;
 
 	priv->rtllib->fts = DEFAULT_FRAG_THRESHOLD;
drivers/staging/rtl8192e/rtllib.h +0 -1
index fdb7990130b5..80090f8a38e7 100644
@@ -1441,7 +1441,6 @@ struct rtllib_device {
 				 */
 
 	/* If the host performs {en,de}cryption, then set to 1 */
-	int host_encrypt;
 	int host_decrypt;
 
 	int ieee802_1x; /* is IEEE 802.1X used */
drivers/staging/rtl8192e/rtllib_module.c +0 -1
index d6a4d6b4ec57..2ad2e3671ec4 100644
@@ -98,7 +98,6 @@ struct net_device *alloc_rtllib(int sizeof_priv)
 	ieee->open_wep = 1;
 
 	/* Default to enabling full open WEP with host based encrypt/decrypt */
-	ieee->host_encrypt = 1;
 	ieee->host_decrypt = 1;
 	ieee->ieee802_1x = 1; /* Default to supporting 802.1x */
drivers/staging/rtl8192e/rtllib_softmac.c +4 -8
index c1e5127f5251..23b33a239703 100644
@@ -807,7 +807,7 @@ static struct sk_buff *rtllib_probe_resp(struct rtllib_device *ieee,
 	}
 
 	crypt = ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx];
-	encrypt = ieee->host_encrypt && crypt && crypt->ops &&
+	encrypt = crypt && crypt->ops &&
 		((strcmp(crypt->ops->name, "R-WEP") == 0 || wpa_ie_len));
 	if (ieee->ht_info->bCurrentHTSupport) {
 		tmp_ht_cap_buf = (u8 *)&(ieee->ht_info->SelfHTCap);

@@ -943,10 +943,7 @@ static struct sk_buff *rtllib_assoc_resp(struct rtllib_device *ieee, u8 *dest)
 		assoc->capability |=
 				 cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT_TIME);
 
-	if (ieee->host_encrypt)
-		crypt = ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx];
-	else
-		crypt = NULL;
+	crypt = ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx];
 
 	encrypt = (crypt && crypt->ops);
 

@@ -1115,7 +1112,7 @@ rtllib_association_req(struct rtllib_network *beacon,
 
 	crypt = ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx];
 	if (crypt != NULL)
-		encrypt = ieee->host_encrypt && crypt && crypt->ops &&
+		encrypt = crypt && crypt->ops &&
 			  ((strcmp(crypt->ops->name, "R-WEP") == 0 ||
 			  wpa_ie_len));
 	else

@@ -2995,8 +2992,7 @@ u8 rtllib_ap_sec_type(struct rtllib_device *ieee)
 
 	crypt = ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx];
 	encrypt = (ieee->current_network.capability & WLAN_CAPABILITY_PRIVACY)
-		  || (ieee->host_encrypt && crypt && crypt->ops &&
-		  (strcmp(crypt->ops->name, "R-WEP") == 0));
+		  || (crypt && crypt->ops && (strcmp(crypt->ops->name, "R-WEP") == 0));
 
 	/* simply judge  */
 	if (encrypt && (wpa_ie_len == 0)) {
drivers/staging/rtl8192e/rtllib_tx.c +1 -2
index ec038ef806c3..24fd40284420 100644
@@ -635,8 +635,7 @@ static int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)
 
 		skb->priority = rtllib_classify(skb, IsAmsdu);
 		crypt = ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx];
-		encrypt = !(ether_type == ETH_P_PAE && ieee->ieee802_1x) &&
-			ieee->host_encrypt && crypt && crypt->ops;
+		encrypt = !(ether_type == ETH_P_PAE && ieee->ieee802_1x) && crypt && crypt->ops;
 		if (!encrypt && ieee->ieee802_1x &&
 		    ieee->drop_unencrypted && ether_type != ETH_P_PAE) {
 			stats->tx_dropped++;
Signature · 1 line
2.41.0
author
#7 lore raw

PATCH 7/11 staging: rtl8192e: Remove variable host_decrypt as it is constant

In reply to Philipp Hortmann

ieee->host_decrypt also named priv->rtllib->host_decrypt is initialized to 1 and then unchanged. All evaluations will result accordingly. Remove resulting dead code.

Signed-off-by Philipp Hortmann <[email protected]>
---
 drivers/staging/rtl8192e/rtl8192e/rtl_core.c |  1 -
 drivers/staging/rtl8192e/rtllib.h            |  3 --
 drivers/staging/rtl8192e/rtllib_module.c     |  2 -
 drivers/staging/rtl8192e/rtllib_rx.c         | 44 ++++++++++----------
 4 files changed, 21 insertions(+), 29 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +0 -1
index 838b9c8b0df7..2f504a4838a8 100644
@@ -804,7 +804,6 @@ static void _rtl92e_init_priv_variable(struct net_device *dev)
 	priv->rtllib->iw_mode = IW_MODE_INFRA;
 	priv->rtllib->active_scan = 1;
 	priv->rtllib->be_scan_inprogress = false;
-	priv->rtllib->host_decrypt = 1;
 
 	priv->rtllib->fts = DEFAULT_FRAG_THRESHOLD;
drivers/staging/rtl8192e/rtllib.h +0 -3
index 80090f8a38e7..c7f800a0c48c 100644
@@ -1440,9 +1440,6 @@ struct rtllib_device {
 				 * WEP key changes
 				 */
 
-	/* If the host performs {en,de}cryption, then set to 1 */
-	int host_decrypt;
-
 	int ieee802_1x; /* is IEEE 802.1X used */
 
 	/* WPA data */
drivers/staging/rtl8192e/rtllib_module.c +0 -2
index 2ad2e3671ec4..2416e0c60255 100644
@@ -97,8 +97,6 @@ struct net_device *alloc_rtllib(int sizeof_priv)
 	ieee->scan_age = DEFAULT_MAX_SCAN_AGE;
 	ieee->open_wep = 1;
 
-	/* Default to enabling full open WEP with host based encrypt/decrypt */
-	ieee->host_decrypt = 1;
 	ieee->ieee802_1x = 1; /* Default to supporting 802.1x */
 
 	ieee->rtllib_ap_sec_type = rtllib_ap_sec_type;
drivers/staging/rtl8192e/rtllib_rx.c +21 -23

64 lines not on this page · raw message

Signature · 1 line
2.41.0
author
#8 lore raw

PATCH 8/11 staging: rtl8192e: Remove variable card_type

In reply to Philipp Hortmann

Remove variable card_type as it is initialized but never unused.

Signed-off-by Philipp Hortmann <[email protected]>
---
 drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 --
 drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 ------
 2 files changed, 8 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +0 -2
index 2f504a4838a8..e9eb55c6e6d8 100644
@@ -807,8 +807,6 @@ static void _rtl92e_init_priv_variable(struct net_device *dev)
 
 	priv->rtllib->fts = DEFAULT_FRAG_THRESHOLD;
 
-	priv->card_type = PCI;
-
 	priv->fw_info = vzalloc(sizeof(struct rt_firmware));
 	if (!priv->fw_info)
 		netdev_err(dev,
drivers/staging/rtl8192e/rtl8192e/rtl_core.h +0 -6
index ec9e454299a8..1cb68d53a17e 100644
@@ -259,12 +259,6 @@ struct r8192_priv {
 	u8		polling_timer_on;
 
 	/**********************************************************/
-
-	enum card_type {
-		PCI, MINIPCI,
-		CARDBUS, USB
-	} card_type;
-
 	struct work_struct qos_activate;
 
 	short	promisc;
Signature · 1 line
2.41.0
author
#9 lore raw

PATCH 9/11 staging: rtl8192e: Remove variable bdisable_nic

In reply to Philipp Hortmann

Remove variable bdisable_nic as always set to false. Remove dead code.

Signed-off-by Philipp Hortmann <[email protected]>
---
 drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 12 ------------
 drivers/staging/rtl8192e/rtl8192e/rtl_core.h |  1 -
 2 files changed, 13 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +0 -12
index e9eb55c6e6d8..23f9b729940b 100644
@@ -618,8 +618,6 @@ static int _rtl92e_sta_up(struct net_device *dev, bool is_silent_reset)
 					(&priv->rtllib->pwr_save_ctrl);
 	bool init_status;
 
-	priv->bdisable_nic = false;
-
 	priv->up = 1;
 	priv->rtllib->ieee_up = 1;
 

@@ -760,7 +758,6 @@ static void _rtl92e_init_priv_variable(struct net_device *dev)
 	priv->up_first_time = 1;
 	priv->blinked_ingpio = false;
 	priv->being_init_adapter = false;
-	priv->bdisable_nic = false;
 	priv->txringcount = 64;
 	priv->rxbuffersize = 9100;
 	priv->rxringcount = MAX_RX_COUNT;

@@ -1498,12 +1495,6 @@ static short _rtl92e_tx(struct net_device *dev, struct sk_buff *skb)
 	int   idx;
 	u32 fwinfo_size = 0;
 
-	if (priv->bdisable_nic) {
-		netdev_warn(dev, "%s: Nic is disabled! Can't tx packet.\n",
-			    __func__);
-		return skb->len;
-	}
-
 	priv->rtllib->bAwakePktSent = true;
 
 	fwinfo_size = sizeof(struct tx_fwinfo_8190pci);

@@ -2245,20 +2236,17 @@ bool rtl92e_enable_nic(struct net_device *dev)
 
 	if (!priv->up) {
 		netdev_warn(dev, "%s(): Driver is already down!\n", __func__);
-		priv->bdisable_nic = false;
 		return false;
 	}
 
 	init_status = rtl92e_start_adapter(dev);
 	if (!init_status) {
 		netdev_warn(dev, "%s(): Initialization failed!\n", __func__);
-		priv->bdisable_nic = false;
 		return false;
 	}
 	RT_CLEAR_PS_LEVEL(psc, RT_RF_OFF_LEVL_HALT_NIC);
 
 	rtl92e_irq_enable(dev);
-	priv->bdisable_nic = false;
 	return init_status;
 }
drivers/staging/rtl8192e/rtl8192e/rtl_core.h +0 -1
index 1cb68d53a17e..38b215d86eeb 100644
@@ -322,7 +322,6 @@ struct r8192_priv {
 
 	bool rf_change_in_progress;
 	bool set_rf_pwr_state_in_progress;
-	bool bdisable_nic;
 
 	u8 cck_pwr_enl;
 	u16 tssi_13dBm;
Signature · 1 line
2.41.0
author
#10 lore raw

PATCH 10/11 staging: rtl8192e: Remove variable priv->reg_chnl_plan

In reply to Philipp Hortmann

Remove variable priv->reg_chnl_plan as it is only once initialized and only once evaluated. So the result is always the same. Remove dead code.

Signed-off-by Philipp Hortmann <[email protected]>
---
 drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 5 +----
 drivers/staging/rtl8192e/rtl8192e/rtl_core.c   | 1 -
 drivers/staging/rtl8192e/rtl8192e/rtl_core.h   | 1 -
 3 files changed, 1 insertion(+), 6 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +1 -4
index e5925899402c..5ac6af7e3a79 100644
@@ -419,10 +419,7 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)
 
 	rtl92e_init_adaptive_rate(dev);
 
-	if (priv->reg_chnl_plan == 0xf)
-		priv->chnl_plan = priv->eeprom_chnl_plan;
-	else
-		priv->chnl_plan = priv->reg_chnl_plan;
+	priv->chnl_plan = priv->eeprom_chnl_plan;
 
 	switch (priv->eeprom_customer_id) {
 	case EEPROM_CID_NetCore:
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +0 -1
index 23f9b729940b..a24527585166 100644
@@ -763,7 +763,6 @@ static void _rtl92e_init_priv_variable(struct net_device *dev)
 	priv->rxringcount = MAX_RX_COUNT;
 	priv->irq_enabled = 0;
 	priv->chan = 1;
-	priv->reg_chnl_plan = 0xf;
 	priv->rtllib->mode = WIRELESS_MODE_AUTO;
 	priv->rtllib->iw_mode = IW_MODE_INFRA;
 	priv->rtllib->net_promiscuous_md = false;
drivers/staging/rtl8192e/rtl8192e/rtl_core.h +0 -1
index 38b215d86eeb..fa82a0667813 100644
@@ -316,7 +316,6 @@ struct r8192_priv {
 
 	bool tx_pwr_data_read_from_eeprom;
 
-	u16 reg_chnl_plan;
 	u16 chnl_plan;
 	u8 hw_rf_off_action;
Signature · 1 line
2.41.0
author
#11 lore raw

PATCH 11/11 staging: rtl8192e: Remove variable ieee->short_slot

In reply to Philipp Hortmann

ieee->short_slot also named priv->rtllib->short_slot is initialized to 1 and then unchanged. All evaluations will result accordingly. Remove resulting dead code.

Signed-off-by Philipp Hortmann <[email protected]>
---
 drivers/staging/rtl8192e/rtl8192e/rtl_core.c |  1 -
 drivers/staging/rtl8192e/rtllib.h            |  1 -
 drivers/staging/rtl8192e/rtllib_softmac.c    | 10 +++-------
 3 files changed, 3 insertions(+), 9 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +0 -1
index a24527585166..aaff8d739efe 100644
@@ -774,7 +774,6 @@ static void _rtl92e_init_priv_variable(struct net_device *dev)
 	priv->retry_data = DEFAULT_RETRY_DATA;
 	priv->rtllib->rts = DEFAULT_RTS_THRESHOLD;
 	priv->rtllib->rate = 110;
-	priv->rtllib->short_slot = 1;
 	priv->promisc = (dev->flags & IFF_PROMISC) ? 1 : 0;
 	priv->bcck_in_ch14 = false;
 	priv->cck_present_attn = 0;
drivers/staging/rtl8192e/rtllib.h +0 -1
index c7f800a0c48c..aa8abec390ca 100644
@@ -1486,7 +1486,6 @@ struct rtllib_device {
 
 	enum rtl_link_state link_state;
 
-	int short_slot;
 	int mode;       /* A, B, G */
 
 	/* used for forcing the ibss workqueue to terminate
drivers/staging/rtl8192e/rtllib_softmac.c +3 -7
index 23b33a239703..584371f0ce57 100644
@@ -852,8 +852,7 @@ static struct sk_buff *rtllib_probe_resp(struct rtllib_device *ieee,
 		cpu_to_le16(ieee->current_network.capability &
 		WLAN_CAPABILITY_SHORT_PREAMBLE);
 
-	if (ieee->short_slot && (ieee->current_network.capability &
-	    WLAN_CAPABILITY_SHORT_SLOT_TIME))
+	if (ieee->current_network.capability & WLAN_CAPABILITY_SHORT_SLOT_TIME)
 		beacon_buf->capability |=
 			cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT_TIME);
 

@@ -939,9 +938,7 @@ static struct sk_buff *rtllib_assoc_resp(struct rtllib_device *ieee, u8 *dest)
 	assoc->capability = cpu_to_le16(ieee->iw_mode == IW_MODE_MASTER ?
 		WLAN_CAPABILITY_ESS : WLAN_CAPABILITY_IBSS);
 
-	if (ieee->short_slot)
-		assoc->capability |=
-				 cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT_TIME);
+	assoc->capability |= cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT_TIME);
 
 	crypt = ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx];
 

@@ -1190,8 +1187,7 @@ rtllib_association_req(struct rtllib_network *beacon,
 	if (beacon->capability & WLAN_CAPABILITY_SHORT_PREAMBLE)
 		hdr->capability |= cpu_to_le16(WLAN_CAPABILITY_SHORT_PREAMBLE);
 
-	if (ieee->short_slot &&
-	   (beacon->capability & WLAN_CAPABILITY_SHORT_SLOT_TIME))
+	if (beacon->capability & WLAN_CAPABILITY_SHORT_SLOT_TIME)
 		hdr->capability |= cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT_TIME);
 
 	hdr->listen_interval = cpu_to_le16(beacon->listen_interval);
Signature · 1 line
2.41.0