From 7dde54b627f71dd5cefbc3737af1e089739f8901 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Sun, 28 Nov 2010 23:00:03 +0200 Subject: [PATCH] --- yaml --- r: 228233 b: refs/heads/master c: 9618386a4e58e0459932846d9b07fa81225840d3 h: refs/heads/master i: 228231: b90b9fef48aef98342d9d50f9e90b0af9896d6b0 v: v3 --- [refs] | 2 +- trunk/drivers/staging/winbond/mds.c | 5 ----- trunk/drivers/staging/winbond/mds_s.h | 4 ---- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 98c523bb5013..dfdf7d32d479 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9255650cbf997762bd667896b0b86661cd81c9b4 +refs/heads/master: 9618386a4e58e0459932846d9b07fa81225840d3 diff --git a/trunk/drivers/staging/winbond/mds.c b/trunk/drivers/staging/winbond/mds.c index b4e0514b7f34..0daabdc8d91c 100644 --- a/trunk/drivers/staging/winbond/mds.c +++ b/trunk/drivers/staging/winbond/mds.c @@ -481,11 +481,6 @@ Mds_Tx(struct wbsoft_priv *adapter) XmitBufSize += CurrentSize; XmitBufAddress += CurrentSize; -#ifdef _IBSS_BEACON_SEQ_STICK_ - if ((XmitBufAddress[DOT_11_DA_OFFSET+8] & 0xfc) != MAC_SUBTYPE_MNGMNT_PROBE_REQUEST) /* +8 for USB hdr */ -#endif - pMds->TxToggle = true; - /* Get packet to transmit completed, 1:TESTSTA 2:MLME 3: Ndis data */ MLME_SendComplete(adapter, 0, true); diff --git a/trunk/drivers/staging/winbond/mds_s.h b/trunk/drivers/staging/winbond/mds_s.h index e2de4bd23b4d..eeedf0186365 100644 --- a/trunk/drivers/staging/winbond/mds_s.h +++ b/trunk/drivers/staging/winbond/mds_s.h @@ -107,10 +107,6 @@ struct wb35_mds { u8 TxRate[((MAX_USB_TX_DESCRIPTOR + 1) & ~0x01)][2]; /* [0] current tx rate, [1] fall back rate */ u8 TxInfo[((MAX_USB_TX_DESCRIPTOR + 1) & ~0x01)]; /*Store information for callback function */ - /* for scanning mechanism */ - u8 TxToggle; /* It is TRUE if there are tx activities in some time interval */ - u8 Reserved_[3]; - /* ---- for Tx Parameter */ u16 TxFragmentThreshold; /* For frame body only */ u16 TxRTSThreshold;