Skip to contentSkip to conversation

staging: rtl8192su: remove dead code

RFC PATCH In review Frederic Leroy 3 participants 3 messages Feb 17, 2010 – Feb 18, 2010 Staging

lore
Share & tools
lore

Frederic Leroy

author
#0 lore raw

RFC PATCH 1/1 staging: rtl8192su: remove dead code

Hello,

This patch removes some dead code in rtl8192su driver in staging against linux-2.6-stable tree. Should I split it into smaller chunk ?
As it is in staging, should I post it to [email protected] ?

Signature · 9 lines
Frédéric Leroy

commit a7d4098964566955d1ffde9921f6c9b7f276cc73
Author: Frédéric Leroy <[email protected]>
Date:   Wed Feb 17 00:49:35 2010 +0100

    staging: rtl8292su: remove dead code
    
    this patch removes dead code enclosed by undefined vars RTL8190P/RTL8192E/TO_DO_LIST
drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c +0 -24
index 4d54e1e..378ed9e 100644
@@ -316,14 +316,6 @@ void ieee80211_tx_query_agg_cap(struct ieee80211_device* ieee, struct sk_buff* s
 
 	if (is_multicast_ether_addr(hdr->addr1) || is_broadcast_ether_addr(hdr->addr1))
 		return;
-	//check packet and mode later
-#ifdef TO_DO_LIST
-	if(pTcb->PacketLength >= 4096)
-		return;
-	// For RTL819X, if pairwisekey = wep/tkip, we don't aggrregation.
-	if(!Adapter->HalFunc.GetNmodeSupportBySecCfgHandler(Adapter))
-		return;
-#endif
 
 	if(pHTInfo->IOTAction & HT_IOT_ACT_TX_NO_AGGREGATION)
 		return;

@@ -561,22 +553,6 @@ NO_PROTECTION:
 
 void ieee80211_txrate_selectmode(struct ieee80211_device* ieee, cb_desc* tcb_desc)
 {
-#ifdef TO_DO_LIST
-	if(!IsDataFrame(pFrame))
-	{
-		pTcb->bTxDisableRateFallBack = TRUE;
-		pTcb->bTxUseDriverAssingedRate = TRUE;
-		pTcb->RATRIndex = 7;
-		return;
-	}
-
-	if(pMgntInfo->ForcedDataRate!= 0)
-	{
-		pTcb->bTxDisableRateFallBack = TRUE;
-		pTcb->bTxUseDriverAssingedRate = TRUE;
-		return;
-	}
-#endif
 	if(ieee->bTxDisableRateFallBack)
 		tcb_desc->bTxDisableRateFallBack = true;
drivers/staging/rtl8192su/ieee80211/rtl819x_HTProc.c +0 -4
index 33c7fa7..378f8b1 100644
@@ -89,10 +89,6 @@ void HTUpdateDefaultSetting(struct ieee80211_device* ieee)
 	ieee->bTxDisableRateFallBack = 0;
 	ieee->bTxUseDriverAssingedRate = 0;
 
-#ifdef 	TO_DO_LIST
-	// 8190 only. Assign duration operation mode to firmware
-	pMgntInfo->bTxEnableFwCalcDur = (BOOLEAN)pNdisCommon->bRegTxEnableFwCalcDur;
-#endif
 	// 8190 only, Realtek proprietary aggregation mode
 	// Set MPDUDensity=2,   1: Set MPDUDensity=2(32k)  for Realtek AP and set MPDUDensity=0(8k) for others
 	pHTInfo->bRegRT2RTAggregation = 1;//0: Set MPDUDensity=2,   1: Set MPDUDensity=2(32k)  for Realtek AP and set MPDUDensity=0(8k) for others
drivers/staging/rtl8192su/r8192S_Efuse.c +0 -270

306 lines not on this page · raw message

drivers/staging/rtl8192su/r8192S_phy.c +0 -228

282 lines not on this page · raw message

drivers/staging/rtl8192su/r8192S_rtl8225.h +0 -4
index 8a64728..7a16a3b 100644
@@ -13,11 +13,7 @@
 #ifndef RTL8225H
 #define RTL8225H
 
-#ifdef RTL8190P
-#define RTL819X_TOTAL_RF_PATH 4 //for 90P
-#else
 #define RTL819X_TOTAL_RF_PATH 2 //for 8192U
-#endif
 extern void PHY_SetRF0222DBandwidth(struct net_device* dev , HT_CHANNEL_WIDTH Bandwidth);	//20M or 40M;
 extern void PHY_SetRF8225Bandwidth(	struct net_device* dev ,	HT_CHANNEL_WIDTH Bandwidth);
 extern bool PHY_RF8225_Config(struct net_device* dev );
drivers/staging/rtl8192su/r8192U_core.c +0 -173

206 lines not on this page · raw message

drivers/staging/rtl8192su/r8192U_dm.c +0 -239

471 lines not on this page · raw message

#1 lore raw
Quoted 5 lines · Frederic Leroy

Hello,

This patch removes some dead code in rtl8192su driver in staging against linux-2.6-stable tree. Should I split it into smaller chunk ?
As it is in staging, should I post it to [email protected] ?

At 1400+ lines, the patch is a little large. I would recommend that you separate out the fixes for "ifdef RTL8190P" and "ifdef RTL8190U" into one patch, and the changes for "ifdef TO_DO_LIST" into a couple of patches. That should get the line count to below 500 in the individual patches.

These patches should be sent to GregKH with Cc: to linux-wireless and [email protected].

I'm not sure how you sent this patch, but when I extracted it from my mailer (Thunderbird 3.0.1), it ended up with no line breaks. To get it as a usable file, I had to copy and paste. Coordinators get rather testy when presented with such patches.

Larry

#2 lore raw
Quoted 11 lines · Larry Finger
Quoted 5 lines · Frederic Leroy

Hello,

This patch removes some dead code in rtl8192su driver in staging against linux-2.6-stable tree. Should I split it into smaller chunk ?
As it is in staging, should I post it to [email protected] ?

At 1400+ lines, the patch is a little large. I would recommend that you separate out the fixes for "ifdef RTL8190P" and "ifdef RTL8190U" into one patch, and the changes for "ifdef TO_DO_LIST" into a couple of patches. That should get the line count to below 500 in the individual patches.

I agree, that would be a better way to do this.

thanks,

greg k-h