Skip to contentSkip to conversation

w35und: remove some more junk and fix divide by zero

PATCH Pavel Machek 1 participant 1 message Apr 16, 2008 Networking drivers (wireless)

lore
Share & tools
lore
#0 lore raw

Hi!

Driver now seems to work a bit better than before...

Pavel

drivers/net/wireless/winbond/winbondport/mds.c +2 -27
index 8064deb..b2bd830 100644
@@ -522,6 +522,8 @@ Mds_DurationSet(  PADAPTER Adapter,  PDE
 	OffsetSize = pDes->FragmentThreshold + 32 + 3;
 	OffsetSize &= ~0x03;
 	Rate = pDes->TxRate >> 1;
+	if (!Rate)
+		Rate = 1;
 
 	pT00 = (PT00_DESCRIPTOR)buffer;
 	pT01 = (PT01_DESCRIPTOR)(buffer+4);
@@ -620,7 +622,6 @@ Mds_DurationSet(  PADAPTER Adapter,  PDE
 		Duration = 0;
 	else
 	{
-		//for( i=0; i<pDes->FragmentCount-1; i++ )
 		for( i=pDes->FragmentCount-1; i>0; i-- )
 		{
 			NextBodyLen = (u16)pNextT00->T00_frame_length;
@@ -654,32 +655,6 @@ Mds_DurationSet(  PADAPTER Adapter,  PDE
 			}
 
 			((PUSHORT)buffer)[5] = cpu_to_le16(Duration);// 4 USHOR for skip 8B USB, 2USHORT=FC + Duration
-			#if 0 //20061009 marked by anson's endian
-			#ifdef WB_LINUX // Suitable for Big/Little endian
-			{
-				u32	ltmp;
-				ltmp = pNextT00->T00_frame_length;
-				ltmp |= (pNextT00->T00_header_length<<12);
-				ltmp |= (pNextT00->T00_tx_packet_id<<22);
-				ltmp |= (pNextT00->T00_IgnoreResult<<28);
-				ltmp |= (pNextT00->T00_IsLastMpdu<<29);
-				ltmp |= (pNextT00->T00_last_mpdu<<30);
-				ltmp |= (pNextT00->T00_first_mpdu<<31);
-				pNextT00->value = cpu_to_le32( ltmp );
-
-				ltmp = pT01->T01_retry_abort_ebable;
-				ltmp |= (pT01->T01_wep_id<<4);
-				ltmp |= (pT01->T01_transmit_rate<<6);
-				ltmp |= (pT01->T01_plcp_header_length<<9);
-				ltmp |= (pT01->T01_modulation_type<<10);
-				ltmp |= (pT01->T01_add_cts<<11);
-				ltmp |= (pT01->T01_add_rts<<12);
-				ltmp |= (pT01->T01_rts_cts_duration<<16);
-				//pT01->value = cpu_to_le16( pT01->value );
-				pT01->value = cpu_to_le32( ltmp );  //anson
-			}
-			#endif
-			#endif
 			
 			//----20061009 add by anson's endian
 			pNextT00->value = cpu_to_le32(pNextT00->value);
drivers/net/wireless/winbond/winbondport/mlme_auth.c +0 -222

225 lines not on this page · raw message

drivers/net/wireless/winbond/winbondport/rxisr.c +1 -7
index e9cca3c..40c4f55 100644
@@ -169,14 +169,8 @@ void Mds_MsduProcess(  PWB32_ADAPTER Ada
 		}
 
 		// Indicate to Upper Module
-		MDS_EthernetPacketReceive(Adapter, pRxLayer1);
 		Adapter->sLocalPara._NumRxMSDU++; // A packet be indicated
-	} else	{
-		if (!WEPed)
-			Adapter->sLocalPara._dot11WEPExcludedCount ++;
-		else
-			Adapter->sLocalPara._dot11WEPUndecryptableCount ++;
-	}// End of if( (!WEPed && !MLMEGetExcl...
+	}
 }
 
 void vRxTimerInit(PWB32_ADAPTER Adapter)
drivers/net/wireless/winbond/winbondport/wblinux.c +0 -114

132 lines not on this page · raw message

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html