linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* w35und: some more code removal
@ 2008-05-05 20:09 Pavel Machek
  2008-05-05 20:17 ` Johannes Berg
  0 siblings, 1 reply; 7+ messages in thread
From: Pavel Machek @ 2008-05-05 20:09 UTC (permalink / raw)
  To: kernel list, kaszak, lcostantino, linux-wireless


Remove some more unneccessary code

---
commit 5b251c6315097d5f9ab5d30c43813fe74c1db4e4
tree 5ca21582f55886d5f0249f7ca139687450024581
parent e44ccdabb97fa4a6cdc1a95adcad7bcc469d0c16
author Pavel <pavel@amd.ucw.cz> Mon, 05 May 2008 22:08:51 +0200
committer Pavel <pavel@amd.ucw.cz> Mon, 05 May 2008 22:08:51 +0200

 drivers/net/wireless/winbond/winbondport/mds.c     |   46 +++-----------------
 drivers/net/wireless/winbond/winbondport/wblinux.c |    8 +--
 2 files changed, 11 insertions(+), 43 deletions(-)

diff --git a/drivers/net/wireless/winbond/winbondport/mds.c b/drivers/net/wireless/winbond/winbondport/mds.c
index ad09d0b..44f3b61 100644
--- a/drivers/net/wireless/winbond/winbondport/mds.c
+++ b/drivers/net/wireless/winbond/winbondport/mds.c
@@ -46,10 +46,8 @@ Mds_Tx(PADAPTER Adapter)
 	unsigned char	BufferFilled = FALSE, MICAdd = 0;
 
 
-	//931130.5.a
 	if (pMds->TxPause)
 		return;
-	// 20060717.3 Add
 	if (!hal_driver_init_OK(pHwData))
 		return;
 
@@ -195,9 +193,7 @@ Mds_SendComplete(PADAPTER Adapter, PT02_
 		RetryCount = (u8)pT02->T02_MPDU_Cnt;
 		if (pT02->value & FLAG_ERROR_TX_MASK) {
 			SendOK = FALSE;
-			#ifdef _PE_DTO_DUMP_
-			WBDEBUG(("Mds Tx Fail[%d] = %8x\n", PacketId, pT02->value ));
-			#endif
+
 			if (pT02->T02_transmit_abort || pT02->T02_out_of_MaxTxMSDULiftTime) {
 				//retry error
 				pHwData->dto_tx_retry_count += (RetryCount+1);
@@ -226,25 +222,6 @@ Mds_SendComplete(PADAPTER Adapter, PT02_
 			MTO_SetTxCount(Adapter, TxRate, RetryCount);
 		}
 
-		// Return result
-		if( pMds->TxDesFrom[ PacketId ] == 3 )
-			{ BUG(); }
-		else if( pMds->TxDesFrom[ PacketId ] == 2 )
-			{ }
-		else if( pMds->TxDesFrom[ PacketId ] == 1 )
-			{ BUG();  }
-
-		//The next 802.1x message callback after 2 MIC error occur within 60s
-		//TODO: ?? Don't care whether the next 802.1x message is transmitted successfully??
-		if (pMds->TxInfo[PacketId] == 1) {
-			// It needs to send disassoc. frame no matter the connection is still
-			// alive or not(AP disassoc. us).
-			#ifdef _PE_STATE_DUMP_
-			WBDEBUG(("!!Countermeasure, disassoc !!\n"));
-			#endif
-			pMds->TxInfo[PacketId] = 0;
-			WARN_ON(1);
-		}
 		// Clear send result buffer
 		pMds->TxResult[ PacketId ] = 0;
 	} else
@@ -391,37 +368,31 @@ Mds_BodyCopy(PADAPTER Adapter, PDESCRIPT
 		stmp &= ~0x03;//4n Alignment
 		Size += stmp;// Current 4n offset of mpdu
 
-		while( CopySize )
-		{
+		while (CopySize) {
 			// Copy body
 			src_buffer = pDes->buffer_address[buf_index];
 			CopyLeft = CopySize;
-			if( CopySize >= pDes->buffer_size[buf_index] )
-			{
+			if (CopySize >= pDes->buffer_size[buf_index]) {
 				CopyLeft = pDes->buffer_size[buf_index];
 
 				// Get the next buffer of descriptor
 				buf_index++;
 				buf_index %= MAX_DESCRIPTOR_BUFFER_INDEX;
-			}
-			else
-			{
+			} else {
 				PUCHAR	pctmp = pDes->buffer_address[buf_index];
 				pctmp += CopySize;
 				pDes->buffer_address[buf_index] = pctmp;
 				pDes->buffer_size[buf_index] -= CopySize;
 			}
 
-			memcpy( buffer,	src_buffer, CopyLeft );
+			memcpy(buffer, src_buffer, CopyLeft);
 			buffer += CopyLeft;
 			CopySize -= CopyLeft;
 		}
 
 		// 931130.5.n
-		if( pMds->MicAdd )
-		{
-			if( !SizeLeft ) //931130.5.o
-			{
+		if (pMds->MicAdd) {
+			if (!SizeLeft) {
 				pMds->MicWriteAddress[ pMds->MicWriteIndex ] = buffer - pMds->MicAdd;
 				pMds->MicWriteSize[ pMds->MicWriteIndex ] = pMds->MicAdd;
 				pMds->MicAdd = 0;
@@ -436,8 +407,7 @@ Mds_BodyCopy(PADAPTER Adapter, PDESCRIPT
 		}
 
 		// Does it need to generate the new header for next mpdu?
-		if( SizeLeft )
-		{
+		if (SizeLeft) {
 			buffer = TargetBuffer + Size; // Get the next 4n start address
 			memcpy( buffer, TargetBuffer, 32 );//Copy 8B USB +24B 802.11
 			pT00 = (PT00_DESCRIPTOR)buffer;
diff --git a/drivers/net/wireless/winbond/winbondport/wblinux.c b/drivers/net/wireless/winbond/winbondport/wblinux.c
index 3e6a0d3..d2b86cb 100644
--- a/drivers/net/wireless/winbond/winbondport/wblinux.c
+++ b/drivers/net/wireless/winbond/winbondport/wblinux.c
@@ -256,8 +256,7 @@ #endif
 	}
 	while(FALSE);
 
-	switch( InitStep )
-	{
+	switch (InitStep) {
 	case 5: 
 	case 4: 
 	case 3: Mds_Destroy( Adapter );
@@ -270,11 +269,10 @@ #endif
 	return FALSE;
 }
 
-// 20060802
 void WBLINUX_ConnectStatus(PADAPTER Adapter, u32 flag)
 {
-   PWBLINUX	pWbLinux = &Adapter->WbLinux;
+	PWBLINUX	pWbLinux = &Adapter->WbLinux;
 
-   pWbLinux->LinkStatus = flag; // OS_DISCONNECTED	or  OS_CONNECTED
+	pWbLinux->LinkStatus = flag; // OS_DISCONNECTED	or  OS_CONNECTED
 }
 

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

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: w35und: some more code removal
  2008-05-05 20:09 w35und: some more code removal Pavel Machek
@ 2008-05-05 20:17 ` Johannes Berg
  2008-05-05 20:21   ` Pavel Machek
  0 siblings, 1 reply; 7+ messages in thread
From: Johannes Berg @ 2008-05-05 20:17 UTC (permalink / raw)
  To: Pavel Machek; +Cc: kernel list, kaszak, lcostantino, linux-wireless

[-- Attachment #1: Type: text/plain, Size: 450 bytes --]

On Mon, 2008-05-05 at 22:09 +0200, Pavel Machek wrote:
> Remove some more unneccessary code
> 
> ---
> commit 5b251c6315097d5f9ab5d30c43813fe74c1db4e4
> tree 5ca21582f55886d5f0249f7ca139687450024581
> parent e44ccdabb97fa4a6cdc1a95adcad7bcc469d0c16
> author Pavel <pavel@amd.ucw.cz> Mon, 05 May 2008 22:08:51 +0200
> committer Pavel <pavel@amd.ucw.cz> Mon, 05 May 2008 22:08:51 +0200

Let me guess, you're using git-am too? :P

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: w35und: some more code removal
  2008-05-05 20:17 ` Johannes Berg
@ 2008-05-05 20:21   ` Pavel Machek
  2008-05-05 20:23     ` Johannes Berg
  2008-05-05 21:26     ` Johannes Berg
  0 siblings, 2 replies; 7+ messages in thread
From: Pavel Machek @ 2008-05-05 20:21 UTC (permalink / raw)
  To: Johannes Berg; +Cc: kernel list, kaszak, lcostantino, linux-wireless

On Mon 2008-05-05 22:17:11, Johannes Berg wrote:
> On Mon, 2008-05-05 at 22:09 +0200, Pavel Machek wrote:
> > Remove some more unneccessary code
> > 
> > ---
> > commit 5b251c6315097d5f9ab5d30c43813fe74c1db4e4
> > tree 5ca21582f55886d5f0249f7ca139687450024581
> > parent e44ccdabb97fa4a6cdc1a95adcad7bcc469d0c16
> > author Pavel <pavel@amd.ucw.cz> Mon, 05 May 2008 22:08:51 +0200
> > committer Pavel <pavel@amd.ucw.cz> Mon, 05 May 2008 22:08:51 +0200
> 
> Let me guess, you're using git-am too? :P

No, this is actually all hand-generated ;-).
									Pavel

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

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: w35und: some more code removal
  2008-05-05 20:21   ` Pavel Machek
@ 2008-05-05 20:23     ` Johannes Berg
  2008-05-05 21:13       ` Pavel Machek
  2008-05-05 21:26     ` Johannes Berg
  1 sibling, 1 reply; 7+ messages in thread
From: Johannes Berg @ 2008-05-05 20:23 UTC (permalink / raw)
  To: Pavel Machek; +Cc: kernel list, kaszak, lcostantino, linux-wireless

[-- Attachment #1: Type: text/plain, Size: 810 bytes --]

On Mon, 2008-05-05 at 22:21 +0200, Pavel Machek wrote:
> On Mon 2008-05-05 22:17:11, Johannes Berg wrote:
> > On Mon, 2008-05-05 at 22:09 +0200, Pavel Machek wrote:
> > > Remove some more unneccessary code
> > > 
> > > ---
> > > commit 5b251c6315097d5f9ab5d30c43813fe74c1db4e4
> > > tree 5ca21582f55886d5f0249f7ca139687450024581
> > > parent e44ccdabb97fa4a6cdc1a95adcad7bcc469d0c16
> > > author Pavel <pavel@amd.ucw.cz> Mon, 05 May 2008 22:08:51 +0200
> > > committer Pavel <pavel@amd.ucw.cz> Mon, 05 May 2008 22:08:51 +0200
> > 
> > Let me guess, you're using git-am too? :P
> 
> No, this is actually all hand-generated ;-).

Seriously though, we (as inhabitants of linux-wireless) have no context
for these patches, so I hope you're not expecting us to actually look at
them.

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: w35und: some more code removal
  2008-05-05 20:23     ` Johannes Berg
@ 2008-05-05 21:13       ` Pavel Machek
  0 siblings, 0 replies; 7+ messages in thread
From: Pavel Machek @ 2008-05-05 21:13 UTC (permalink / raw)
  To: Johannes Berg; +Cc: kernel list, kaszak, lcostantino, linux-wireless

Hi!

> > > > Remove some more unneccessary code
> > > > 
> > > > ---
> > > > commit 5b251c6315097d5f9ab5d30c43813fe74c1db4e4
> > > > tree 5ca21582f55886d5f0249f7ca139687450024581
> > > > parent e44ccdabb97fa4a6cdc1a95adcad7bcc469d0c16
> > > > author Pavel <pavel@amd.ucw.cz> Mon, 05 May 2008 22:08:51 +0200
> > > > committer Pavel <pavel@amd.ucw.cz> Mon, 05 May 2008 22:08:51 +0200
> > > 
> > > Let me guess, you're using git-am too? :P
> > 
> > No, this is actually all hand-generated ;-).
> 
> Seriously though, we (as inhabitants of linux-wireless) have no context
> for these patches, so I hope you're not expecting us to actually look at
> them.

I mainly want them archived at public place, and maybe let others know
that I'm working on this.

Context is at http://code.google.com/p/winbondport/ . I hope to get
something that can be merged one day; any help with cleaning the code
is very welcome.

I believe code is now in shape where it can be incrementally cleaned
up for a merge, then features can be added back... (Currently it is
locked to single channel at single speed).
									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: w35und: some more code removal
  2008-05-05 20:21   ` Pavel Machek
  2008-05-05 20:23     ` Johannes Berg
@ 2008-05-05 21:26     ` Johannes Berg
  2008-05-06  7:28       ` Pavel Machek
  1 sibling, 1 reply; 7+ messages in thread
From: Johannes Berg @ 2008-05-05 21:26 UTC (permalink / raw)
  To: Pavel Machek; +Cc: kernel list, kaszak, lcostantino, linux-wireless

[-- Attachment #1: Type: text/plain, Size: 741 bytes --]

On Mon, 2008-05-05 at 22:21 +0200, Pavel Machek wrote:
> On Mon 2008-05-05 22:17:11, Johannes Berg wrote:
> > On Mon, 2008-05-05 at 22:09 +0200, Pavel Machek wrote:
> > > Remove some more unneccessary code
> > > 
> > > ---
> > > commit 5b251c6315097d5f9ab5d30c43813fe74c1db4e4
> > > tree 5ca21582f55886d5f0249f7ca139687450024581
> > > parent e44ccdabb97fa4a6cdc1a95adcad7bcc469d0c16
> > > author Pavel <pavel@amd.ucw.cz> Mon, 05 May 2008 22:08:51 +0200
> > > committer Pavel <pavel@amd.ucw.cz> Mon, 05 May 2008 22:08:51 +0200
> > 
> > Let me guess, you're using git-am too? :P
> 
> No, this is actually all hand-generated ;-).

You must be very bored ;) The delme.gz patch creates like a million
empty files :)

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: w35und: some more code removal
  2008-05-05 21:26     ` Johannes Berg
@ 2008-05-06  7:28       ` Pavel Machek
  0 siblings, 0 replies; 7+ messages in thread
From: Pavel Machek @ 2008-05-06  7:28 UTC (permalink / raw)
  To: Johannes Berg; +Cc: kernel list, kaszak, lcostantino, linux-wireless

Hi!

> > > > Remove some more unneccessary code
> > > > 
> > > > ---
> > > > commit 5b251c6315097d5f9ab5d30c43813fe74c1db4e4
> > > > tree 5ca21582f55886d5f0249f7ca139687450024581
> > > > parent e44ccdabb97fa4a6cdc1a95adcad7bcc469d0c16
> > > > author Pavel <pavel@amd.ucw.cz> Mon, 05 May 2008 22:08:51 +0200
> > > > committer Pavel <pavel@amd.ucw.cz> Mon, 05 May 2008 22:08:51 +0200
> > > 
> > > Let me guess, you're using git-am too? :P
> > 
> > No, this is actually all hand-generated ;-).
> 
> You must be very bored ;) The delme.gz patch creates like a million
> empty files :)

Yep, this removes the empty files ;-).

Remove empty files.

---
commit 27d52109134d234d10d1428b898b916a08454c32
tree 11986829aedcd4ac45bb01c3b3b6622a4d49ba67
parent 78b9049df56fbd5fc785b4e7e9c93dbfb8390d2a
author Pavel <pavel@amd.ucw.cz> Tue, 06 May 2008 09:22:29 +0200
committer Pavel <pavel@amd.ucw.cz> Tue, 06 May 2008 09:22:29 +0200

 drivers/net/wireless/winbond/Makefile              |   11 +++++------
 .../net/wireless/winbond/winbondport/bssdbase.c    |    0 
 drivers/net/wireless/winbond/winbondport/ds_tkip.c |    0 
 .../wireless/winbond/winbondport/gui_structures.h  |    0 
 drivers/net/wireless/winbond/winbondport/knl.c     |    0 
 drivers/net/wireless/winbond/winbondport/knl.h     |    0 
 .../wireless/winbond/winbondport/linux/Makefile    |    5 ++++-
 .../winbond/winbondport/linux/new_wireless.c       |    0 
 .../winbond/winbondport/linux/new_wireless.h       |    0 
 .../wireless/winbond/winbondport/linux/sysdef.h    |   10 ----------
 .../wireless/winbond/winbondport/linux/teststa.h   |    0 
 .../net/wireless/winbond/winbondport/mlme_assoc.c  |    0 
 .../net/wireless/winbond/winbondport/mlme_auth.c   |    0 
 drivers/net/wireless/winbond/winbondport/mlme_f.h  |    0 
 .../net/wireless/winbond/winbondport/mlmetask.c    |    0 
 drivers/net/wireless/winbond/winbondport/roam_f.h  |    0 
 drivers/net/wireless/winbond/winbondport/roam_s.h  |    0 
 .../net/wireless/winbond/winbondport/roamtask.c    |    0 
 drivers/net/wireless/winbond/winbondport/scan_f.h  |    0 
 .../net/wireless/winbond/winbondport/scan_probe.c  |    0 
 .../net/wireless/winbond/winbondport/scantask.c    |    0 
 drivers/net/wireless/winbond/winbondport/sme_f.h   |    0 
 drivers/net/wireless/winbond/winbondport/smetask.c |    0 
 drivers/net/wireless/winbond/winbondport/wblinux.c |    1 -
 drivers/net/wireless/winbond/winbondport/wbndis.c  |    0 
 .../net/wireless/winbond/winbondport/wbndis51.c    |    0 
 .../net/wireless/winbond/winbondport/wbndis51_f.h  |    0 
 .../net/wireless/winbond/winbondport/wbndis51_s.h  |    0 
 .../wireless/winbond/winbondport/wbndis_entry.c    |    0 
 .../net/wireless/winbond/winbondport/wbndis_f.h    |    0 
 .../net/wireless/winbond/winbondport/wbndis_s.h    |    0 
 .../net/wireless/winbond/winbondport/wpa/4Way.c    |    0 
 .../net/wireless/winbond/winbondport/wpa/4Way.h    |    0 
 .../winbond/winbondport/wpa/Adapter_Bridge.c       |    0 
 .../winbond/winbondport/wpa/Adapter_Bridge.h       |    0 
 .../wireless/winbond/winbondport/wpa/EapolKey.h    |    0 
 .../winbond/winbondport/wpa/Ndis_Structure.h       |    0 
 .../wireless/winbond/winbondport/wpa/STLFunction.c |    0 
 .../wireless/winbond/winbondport/wpa/STLFunction.h |    0 
 drivers/net/wireless/winbond/winbondport/wpa/aes.c |    0 
 drivers/net/wireless/winbond/winbondport/wpa/aes.h |    0 
 .../wireless/winbond/winbondport/wpa/aes_wrap.c    |    0 
 .../wireless/winbond/winbondport/wpa/aes_wrap.h    |    0 
 drivers/net/wireless/winbond/winbondport/wpa/eap.c |    0 
 drivers/net/wireless/winbond/winbondport/wpa/eap.h |    0 
 .../wireless/winbond/winbondport/wpa/hmac_md5.c    |    0 
 .../wireless/winbond/winbondport/wpa/hmac_md5.h    |    0 
 .../wireless/winbond/winbondport/wpa/hmac_sha1.c   |    0 
 .../wireless/winbond/winbondport/wpa/hmac_sha1.h   |    0 
 drivers/net/wireless/winbond/winbondport/wpa/md5.c |    0 
 drivers/net/wireless/winbond/winbondport/wpa/md5.h |    0 
 .../wireless/winbond/winbondport/wpa/passphrase.c  |    0 
 .../wireless/winbond/winbondport/wpa/passphrase.h  |    0 
 drivers/net/wireless/winbond/winbondport/wpa/prf.c |    0 
 drivers/net/wireless/winbond/winbondport/wpa/prf.h |    0 
 drivers/net/wireless/winbond/winbondport/wpa/rc4.c |    0 
 drivers/net/wireless/winbond/winbondport/wpa/rc4.h |    0 
 drivers/net/wireless/winbond/winbondport/wpa/sha.h |    0 
 .../net/wireless/winbond/winbondport/wpa/sha1.c    |    0 
 .../net/wireless/winbond/winbondport/wpa/wb_wpa.h  |    0 
 .../winbond/winbondport/wpa/wireless_reference.h   |    0 
 61 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/drivers/net/wireless/winbond/Makefile b/drivers/net/wireless/winbond/Makefile
index 6c90a4b..4682dd1 100644
--- a/drivers/net/wireless/winbond/Makefile
+++ b/drivers/net/wireless/winbond/Makefile
@@ -4,12 +4,11 @@
 obj-m := w35und.o
 
 w35und-objs := $(DRIVER_DIR)/wbusb.o $(DRIVER_DIR)/wb35reg.o $(DRIVER_DIR)/wb35rx.o $(DRIVER_DIR)/wb35tx.o \
-	$(DRIVER_DIR)/new_wireless.o \
-	$(BASE_DIR)/bssdbase.o $(BASE_DIR)/ds_tkip.o $(BASE_DIR)/knl.o $(BASE_DIR)/mds.o \
-	$(BASE_DIR)/mlme_assoc.o $(BASE_DIR)/mlme_auth.o $(BASE_DIR)/mlmetask.o $(BASE_DIR)/mlmetxrx.o \
-	$(BASE_DIR)/mto.o $(BASE_DIR)/phy_calibration.o $(BASE_DIR)/reg.o $(BASE_DIR)/roamtask.o \
-	$(BASE_DIR)/rxisr.o $(BASE_DIR)/scan_probe.o $(BASE_DIR)/scantask.o \
-	$(BASE_DIR)/sme_api.o $(BASE_DIR)/smetask.o $(BASE_DIR)/wbhal.o $(BASE_DIR)/wblinux.o  \
+	$(BASE_DIR)/mds.o \
+	$(BASE_DIR)/mlmetxrx.o \
+	$(BASE_DIR)/mto.o $(BASE_DIR)/phy_calibration.o $(BASE_DIR)/reg.o \
+	$(BASE_DIR)/rxisr.o \
+	$(BASE_DIR)/sme_api.o $(BASE_DIR)/wbhal.o $(BASE_DIR)/wblinux.o  \
 
 
 obj-$(CONFIG_W35UND) += w35und.o
diff --git a/drivers/net/wireless/winbond/winbondport/bssdbase.c b/drivers/net/wireless/winbond/winbondport/bssdbase.c
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/ds_tkip.c b/drivers/net/wireless/winbond/winbondport/ds_tkip.c
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/gui_structures.h b/drivers/net/wireless/winbond/winbondport/gui_structures.h
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/knl.c b/drivers/net/wireless/winbond/winbondport/knl.c
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/knl.h b/drivers/net/wireless/winbond/winbondport/knl.h
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/linux/Makefile b/drivers/net/wireless/winbond/winbondport/linux/Makefile
index cf89114..4aadb4f 100644
--- a/drivers/net/wireless/winbond/winbondport/linux/Makefile
+++ b/drivers/net/wireless/winbond/winbondport/linux/Makefile
@@ -9,13 +9,16 @@ #  Linux 2.6 driver for IS89C35D 802.11 
 #
 #=========================================================================
 
+
+# This is not used for build when the wifi module is build into kernel
+# 
 	KERNELDIR := /lib/modules/$(shell uname -r)/build
 	PWD := $(shell pwd)
 	WPA_DIR=../wpa
 
 obj-m := w35und.o
 
-w35und-objs := new_wireless.o wbusb.o wb35reg.o wb35rx.o wb35tx.o\
+w35und-objs := wbusb.o wb35reg.o wb35rx.o wb35tx.o\
 	../bssdbase.o ../ds_tkip.o ../knl.o ../mds.o ../mlme_assoc.o ../mlme_auth.o ../mlmetask.o ../mlmetxrx.o \
 	../mto.o ../phy_calibration.o ../reg.o ../roamtask.o ../rxisr.o ../scan_probe.o ../scantask.o \
 	../sme_api.o ../smetask.o ../wbhal.o ../wblinux.o \
diff --git a/drivers/net/wireless/winbond/winbondport/linux/new_wireless.c b/drivers/net/wireless/winbond/winbondport/linux/new_wireless.c
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/linux/new_wireless.h b/drivers/net/wireless/winbond/winbondport/linux/new_wireless.h
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/linux/sysdef.h b/drivers/net/wireless/winbond/winbondport/linux/sysdef.h
index c844d28..8507c06 100644
--- a/drivers/net/wireless/winbond/winbondport/linux/sysdef.h
+++ b/drivers/net/wireless/winbond/winbondport/linux/sysdef.h
@@ -49,33 +49,23 @@ #include "../sme_s.h"
 #include "../scan_s.h"
 #include "../mds_s.h"
 #include "../mlme_s.h"
-#include "../roam_s.h"
 #include "../bssdscpt.h"
 #include "../sme_api.h"
 #include "../gl_80211.h"
 #include "../mto.h"
 #include "../wblinux_s.h"
 #include "../wbhal_s.h"
-#include "teststa.h"
 
 
-#include "../wpa/wb_wpa.h" // 20060802
-
 #include "../adapter.h"
 
 #include "../mlme_mib.h"
-#include "../knl.h"
-#include "../sme_f.h"
-#include "../mlme_f.h"
-#include "../scan_f.h"
 #include "../mds_f.h"
 #include "../bss_f.h"
 #include "../mlmetxrx_f.h"
-#include "../roam_f.h"
 #include "../mto_f.h"
 #include "../wbhal_f.h"
 #include "../wblinux_f.h"
-#include "new_wireless.h"
 // Kernel Timer resolution, NDIS is 10ms, 10000us
 #define MIN_TIMEOUT_VAL	(10) //ms
 
diff --git a/drivers/net/wireless/winbond/winbondport/linux/teststa.h b/drivers/net/wireless/winbond/winbondport/linux/teststa.h
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/mlme_assoc.c b/drivers/net/wireless/winbond/winbondport/mlme_assoc.c
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/mlme_auth.c b/drivers/net/wireless/winbond/winbondport/mlme_auth.c
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/mlme_f.h b/drivers/net/wireless/winbond/winbondport/mlme_f.h
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/mlmetask.c b/drivers/net/wireless/winbond/winbondport/mlmetask.c
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/roam_f.h b/drivers/net/wireless/winbond/winbondport/roam_f.h
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/roam_s.h b/drivers/net/wireless/winbond/winbondport/roam_s.h
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/roamtask.c b/drivers/net/wireless/winbond/winbondport/roamtask.c
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/scan_f.h b/drivers/net/wireless/winbond/winbondport/scan_f.h
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/scan_probe.c b/drivers/net/wireless/winbond/winbondport/scan_probe.c
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/scantask.c b/drivers/net/wireless/winbond/winbondport/scantask.c
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/sme_f.h b/drivers/net/wireless/winbond/winbondport/sme_f.h
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/smetask.c b/drivers/net/wireless/winbond/winbondport/smetask.c
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wblinux.c b/drivers/net/wireless/winbond/winbondport/wblinux.c
index d2b86cb..ea96135 100644
--- a/drivers/net/wireless/winbond/winbondport/wblinux.c
+++ b/drivers/net/wireless/winbond/winbondport/wblinux.c
@@ -9,7 +9,6 @@
 //
 //============================================================================
 #include "os_common.h"
-#include "linux/new_wireless.h"
 
 u32
 WBLINUX_MemoryAlloc(void* *VirtualAddress, u32 Length)
diff --git a/drivers/net/wireless/winbond/winbondport/wbndis.c b/drivers/net/wireless/winbond/winbondport/wbndis.c
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wbndis51.c b/drivers/net/wireless/winbond/winbondport/wbndis51.c
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wbndis51_f.h b/drivers/net/wireless/winbond/winbondport/wbndis51_f.h
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wbndis51_s.h b/drivers/net/wireless/winbond/winbondport/wbndis51_s.h
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wbndis_entry.c b/drivers/net/wireless/winbond/winbondport/wbndis_entry.c
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wbndis_f.h b/drivers/net/wireless/winbond/winbondport/wbndis_f.h
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wbndis_s.h b/drivers/net/wireless/winbond/winbondport/wbndis_s.h
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wpa/4Way.c b/drivers/net/wireless/winbond/winbondport/wpa/4Way.c
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wpa/4Way.h b/drivers/net/wireless/winbond/winbondport/wpa/4Way.h
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wpa/Adapter_Bridge.c b/drivers/net/wireless/winbond/winbondport/wpa/Adapter_Bridge.c
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wpa/Adapter_Bridge.h b/drivers/net/wireless/winbond/winbondport/wpa/Adapter_Bridge.h
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wpa/EapolKey.h b/drivers/net/wireless/winbond/winbondport/wpa/EapolKey.h
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wpa/Ndis_Structure.h b/drivers/net/wireless/winbond/winbondport/wpa/Ndis_Structure.h
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wpa/STLFunction.c b/drivers/net/wireless/winbond/winbondport/wpa/STLFunction.c
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wpa/STLFunction.h b/drivers/net/wireless/winbond/winbondport/wpa/STLFunction.h
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wpa/aes.c b/drivers/net/wireless/winbond/winbondport/wpa/aes.c
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wpa/aes.h b/drivers/net/wireless/winbond/winbondport/wpa/aes.h
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wpa/aes_wrap.c b/drivers/net/wireless/winbond/winbondport/wpa/aes_wrap.c
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wpa/aes_wrap.h b/drivers/net/wireless/winbond/winbondport/wpa/aes_wrap.h
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wpa/eap.c b/drivers/net/wireless/winbond/winbondport/wpa/eap.c
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wpa/eap.h b/drivers/net/wireless/winbond/winbondport/wpa/eap.h
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wpa/hmac_md5.c b/drivers/net/wireless/winbond/winbondport/wpa/hmac_md5.c
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wpa/hmac_md5.h b/drivers/net/wireless/winbond/winbondport/wpa/hmac_md5.h
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wpa/hmac_sha1.c b/drivers/net/wireless/winbond/winbondport/wpa/hmac_sha1.c
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wpa/hmac_sha1.h b/drivers/net/wireless/winbond/winbondport/wpa/hmac_sha1.h
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wpa/md5.c b/drivers/net/wireless/winbond/winbondport/wpa/md5.c
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wpa/md5.h b/drivers/net/wireless/winbond/winbondport/wpa/md5.h
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wpa/passphrase.c b/drivers/net/wireless/winbond/winbondport/wpa/passphrase.c
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wpa/passphrase.h b/drivers/net/wireless/winbond/winbondport/wpa/passphrase.h
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wpa/prf.c b/drivers/net/wireless/winbond/winbondport/wpa/prf.c
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wpa/prf.h b/drivers/net/wireless/winbond/winbondport/wpa/prf.h
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wpa/rc4.c b/drivers/net/wireless/winbond/winbondport/wpa/rc4.c
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wpa/rc4.h b/drivers/net/wireless/winbond/winbondport/wpa/rc4.h
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wpa/sha.h b/drivers/net/wireless/winbond/winbondport/wpa/sha.h
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wpa/sha1.c b/drivers/net/wireless/winbond/winbondport/wpa/sha1.c
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wpa/wb_wpa.h b/drivers/net/wireless/winbond/winbondport/wpa/wb_wpa.h
deleted file mode 100644
index e69de29..0000000
diff --git a/drivers/net/wireless/winbond/winbondport/wpa/wireless_reference.h b/drivers/net/wireless/winbond/winbondport/wpa/wireless_reference.h
deleted file mode 100644
index e69de29..0000000




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

^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2008-05-06  7:27 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-05 20:09 w35und: some more code removal Pavel Machek
2008-05-05 20:17 ` Johannes Berg
2008-05-05 20:21   ` Pavel Machek
2008-05-05 20:23     ` Johannes Berg
2008-05-05 21:13       ` Pavel Machek
2008-05-05 21:26     ` Johannes Berg
2008-05-06  7:28       ` Pavel Machek

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).