w35und: Remove unused defines from sysdef.h
PATCH 1/13 w35und: Remove unused defines from sysdef.h
This patch removes all the defines in sysdef.h that are not used at all.
--- drivers/staging/winbond/sysdef.h | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-)
drivers/staging/winbond/sysdef.h +0 -6
@@ -2,17 +2,11 @@#ifndef SYS_DEF_H #define SYS_DEF_H -#define WB_LINUX -#define WB_LINUX_WPA_PSK #define _USE_FALLBACK_RATE_#define _WPA2_ -#ifndef _WPA_PSK_DEBUG -#undef _WPA_PSK_DEBUG -#endif -/* debug print options, mark what debug you don't need */ #ifdef FULL_DEBUG
Signature · 1 line
1.7.0.4
PATCH 2/13 w35und: Kill _USE_FALLBACK_RATE_ macro
The _USE_FALLBACK_RATE_ macro parametrizes DEFAULT_RATE_RETRY_LIMIT. It's only used in Mxx_initial() in reg.c where _USE_FALLBACK_RATE_ is always defined because the reg.c file includes sysdef.h at the top. It's therefore safe to remove the _USE_FALLBACK_RATE_ macro.
--- drivers/staging/winbond/sysdef.h | 2 -- drivers/staging/winbond/wb35reg_s.h | 4 ---- 2 files changed, 0 insertions(+), 6 deletions(-)
drivers/staging/winbond/sysdef.h +0 -2
@@ -3,8 +3,6 @@#ifndef SYS_DEF_H #define SYS_DEF_H -#define _USE_FALLBACK_RATE_ -#define _WPA2_/* debug print options, mark what debug you don't need */
drivers/staging/winbond/wb35reg_s.h +0 -4
@@ -51,11 +51,7 @@ struct hw_data;#define DEFAULT_CWMAX 1023/* (M2C) CWmax. Its value is in the range 0-1023. */ #define DEFAULT_AID 1/* (M34) AID. Its value is in the range 1-2007. */ -#ifdef _USE_FALLBACK_RATE_#define DEFAULT_RATE_RETRY_LIMIT 2/* (M38) as named */ -#else -#define DEFAULT_RATE_RETRY_LIMIT 7/* (M38) as named */ -#endif #define DEFAULT_LONG_RETRY_LIMIT 7/* (M38) LongRetryLimit. Its value is in the range 0-15. */ #define DEFAULT_SHORT_RETRY_LIMIT 7/* (M38) ShortRetryLimit. Its value is in the range 0-15. */
Signature · 1 line
1.7.0.4
PATCH 3/13 w35und: Kill WPA2 definitions
In reply to Pekka EnbergThe _WPA2_ macro is always defined but the data structures that are wrapped by it are never used. Kill them.
--- drivers/staging/winbond/mac_structures.h | 46 ------------------------------ drivers/staging/winbond/sysdef.h | 2 - 2 files changed, 0 insertions(+), 48 deletions(-)
drivers/staging/winbond/mac_structures.h +0 -46
@@ -111,9 +111,6 @@/* -- WPA -- */ #define ELEMENT_ID_RSN_WPA 221 -#ifdef _WPA2_ -#define ELEMENT_ID_RSN_WPA2 48 -#endif /* endif WPA2 */ #define WLAN_MAX_PAIRWISE_CIPHER_SUITE_COUNT ((u16) 6)#define WLAN_MAX_AUTH_KEY_MGT_SUITE_LIST_COUNT ((u16) 2)
@@ -367,21 +364,11 @@ struct Extended_Supported_Rates_Element {/* WPA(802.11i draft 3.0) */ #define VERSION_WPA 1 -#ifdef _WPA2_ -#define VERSION_WPA2 1 -#endif /* end def _WPA2_ */ /* WPA2.0 OUI=00:50:F2, the MSB is reserved for suite type */ #define OUI_WPA 0x00F25000 -#ifdef _WPA2_ -/* for wpa2 change to 0x00ACOF04 by Ws 26/04/04 */ -#define OUI_WPA2 0x00AC0F00 -#endif /* end def _WPA2_ */ #define OUI_WPA_ADDITIONAL 0x01#define WLAN_MIN_RSN_WPA_LENGTH 6/* added by ws 09/10/04 */ -#ifdef _WPA2_ -#define WLAN_MIN_RSN_WPA2_LENGTH 2/* Fix to 2 09/14/05 */ -#endif /* end def _WPA2_ */ #define oui_wpa (u32)(OUI_WPA|OUI_WPA_ADDITIONAL)
@@ -390,12 +377,6 @@ struct Extended_Supported_Rates_Element {/* 20061108 For WPS. It's little endian. Big endian is 0x0050F204 */ #define WPA_WPS_OUI cpu_to_le32(0x04F25000) -/* -----WPA2----- */ -#ifdef _WPA2_ -#define WPA2_OUI_BIG ((u32)0x01AC0F00) -#define WPA2_OUI_LITTLE ((u32)0x01AC0F01) -#endif /* end def _WPA2_ */ -/* Authentication suite */ #define OUI_AUTH_WPA_NONE 0x00/* for WPA_NONE */ #define OUI_AUTH_8021X 0x01
@@ -460,33 +441,6 @@ struct RSN_Capability_Element { } __attribute__ ((packed)) ; } __attribute__ ((packed)) ; -#ifdef _WPA2_ -struct pmkid { -u8 pValue[16 ]; -}; - -struct WPA2_RSN_Information_Element { -u8 Element_ID; -u8 Length; -u16 Version; -struct suite_selector GroupKeySuite; -u16 PairwiseKeySuiteCount; -struct suite_selector PairwiseKeySuite[1 ]; - -} __attribute__ ((packed)); - -struct WPA2_RSN_Auth_Sub_Information_Element { -u16 AuthKeyMngtSuiteCount; -struct suite_selector AuthKeyMngtSuite[1 ]; -} __attribute__ ((packed)); - - -struct PMKID_Information_Element { -u16 PMKID_Count; -struct pmkid pmkid[16 ]; -} __attribute__ ((packed)); - -#endif /* enddef _WPA2_ */ /*============================================================ // MAC Frame structure (different type) and subfield structure //============================================================*/
drivers/staging/winbond/sysdef.h +0 -2
@@ -3,8 +3,6 @@#ifndef SYS_DEF_H #define SYS_DEF_H -#define _WPA2_ -/* debug print options, mark what debug you don't need */ #ifdef FULL_DEBUG
Signature · 1 line
1.7.0.4
PATCH 4/13 w35und: Kill unused code in mac_structures.h
In reply to Pekka EnbergThis patch kills tons of unused macros and struct definitions from mac_structures.h.
--- drivers/staging/winbond/mac_structures.h | 499 ------------------------------ 1 files changed, 0 insertions(+), 499 deletions(-)
drivers/staging/winbond/mac_structures.h +0 -499
@@ -21,23 +21,11 @@#ifndef _MAC_Structures_H_#define _MAC_Structures_H_ -#include <linux/skbuff.h> - -/*========================================================= -// Some miscellaneous definitions -//-----*/ -#define MAX_CHANNELS 30#define MAC_ADDR_LENGTH 6 -#define MAX_WEP_KEY_SIZE 16/* 128 bits */ -#define MAX_802_11_FRAGMENT_NUMBER 10/* By spec */ /* ======================================================== // 802.11 Frame define //----- */ -#define MASK_PROTOCOL_VERSION_TYPE 0x0F -#define MASK_FRAGMENT_NUMBER 0x000F -#define SEQUENCE_NUMBER_SHIFT 4 -#define DIFFER_11_TO_3 18#define DOT_11_MAC_HEADER_SIZE 24#define DOT_11_SNAP_SIZE 6#define DOT_11_DURATION_OFFSET 2
@@ -47,15 +35,9 @@#define DOT_11_TYPE_OFFSET 30#define DOT_11_DATA_OFFSET 24#define DOT_11_DA_OFFSET 4 -#define DOT_3_TYPE_ARP 0x80F3 -#define DOT_3_TYPE_IPX 0x8137 -#define DOT_3_TYPE_OFFSET 12 - -#define ETHERNET_HEADER_SIZE 14#define MAX_ETHERNET_PACKET_SIZE 1514 -/* ----- management : Type of Bits (2, 3) and Subtype of Bits (4, 5, 6, 7) */ #define MAC_SUBTYPE_MNGMNT_ASSOC_REQUEST 0x00#define MAC_SUBTYPE_MNGMNT_ASSOC_RESPONSE 0x10
@@ -69,126 +51,6 @@#define MAC_SUBTYPE_MNGMNT_AUTHENTICATION 0xB0#define MAC_SUBTYPE_MNGMNT_DEAUTHENTICATION 0xC0 -/* ----- control : Type of Bits (2, 3) and Subtype of Bits (4, 5, 6, 7) */ -#define MAC_SUBTYPE_CONTROL_PSPOLL 0xA4 -#define MAC_SUBTYPE_CONTROL_RTS 0xB4 -#define MAC_SUBTYPE_CONTROL_CTS 0xC4 -#define MAC_SUBTYPE_CONTROL_ACK 0xD4 -#define MAC_SUBTYPE_CONTROL_CFEND 0xE4 -#define MAC_SUBTYPE_CONTROL_CFEND_CFACK 0xF4 - -/* ----- data : Type of Bits (2, 3) and Subtype of Bits (4, 5, 6, 7) */ -#define MAC_SUBTYPE_DATA 0x08 -#define MAC_SUBTYPE_DATA_CFACK 0x18 -#define MAC_SUBTYPE_DATA_CFPOLL 0x28 -#define MAC_SUBTYPE_DATA_CFACK_CFPOLL 0x38 -#define MAC_SUBTYPE_DATA_NULL 0x48 -#define MAC_SUBTYPE_DATA_CFACK_NULL 0x58 -#define MAC_SUBTYPE_DATA_CFPOLL_NULL 0x68 -#define MAC_SUBTYPE_DATA_CFACK_CFPOLL_NULL 0x78 - -/* ----- Frame Type of Bits (2, 3) */ -#define MAC_TYPE_MANAGEMENT 0x00 -#define MAC_TYPE_CONTROL 0x04 -#define MAC_TYPE_DATA 0x08 - -/* ----- definitions for Management Frame Element ID (1 BYTE) */ -#define ELEMENT_ID_SSID 0 -#define ELEMENT_ID_SUPPORTED_RATES 1 -#define ELEMENT_ID_FH_PARAMETER_SET 2 -#define ELEMENT_ID_DS_PARAMETER_SET 3 -#define ELEMENT_ID_CF_PARAMETER_SET 4 -#define ELEMENT_ID_TIM 5 -#define ELEMENT_ID_IBSS_PARAMETER_SET 6 -/* 7~15 reserverd */ -#define ELEMENT_ID_CHALLENGE_TEXT 16 -/* 17~31 reserved for challenge text extension */ -/* 32~255 reserved */ -/*-- 11G -- */ -#define ELEMENT_ID_ERP_INFORMATION 42 -#define ELEMENT_ID_EXTENDED_SUPPORTED_RATES 50 - -/* -- WPA -- */ - -#define ELEMENT_ID_RSN_WPA 221 - -#define WLAN_MAX_PAIRWISE_CIPHER_SUITE_COUNT ((u16) 6) -#define WLAN_MAX_AUTH_KEY_MGT_SUITE_LIST_COUNT ((u16) 2) - -/* =================================================================== -* Reason Code (Table 18): indicate the reason of DisAssoc, DeAuthen -* length of ReasonCode is 2 Octs. -* =================================================================== */ -#define REASON_REASERED 0 -#define REASON_UNSPECIDIED 1 -#define REASON_PREAUTH_INVALID 2 -#define DEAUTH_REASON_LEFT_BSS 3 -#define DISASS_REASON_AP_INACTIVE 4 -#define DISASS_REASON_AP_BUSY 5 -#define REASON_CLASS2_FRAME_FROM_NONAUTH_STA 6 -#define REASON_CLASS3_FRAME_FROM_NONASSO_STA 7 -#define DISASS_REASON_LEFT_BSS 8 -#define REASON_NOT_AUTH_YET 9 -/* 802.11i define */ -#define REASON_INVALID_IE 13 -#define REASON_MIC_ERROR 14 -#define REASON_4WAY_HANDSHAKE_TIMEOUT 15 -#define REASON_GROUPKEY_UPDATE_TIMEOUT 16 -#define REASON_IE_DIFF_4WAY_ASSOC 17 -#define REASON_INVALID_MULTICAST_CIPHER 18 -#define REASON_INVALID_UNICAST_CIPHER 19 -#define REASON_INVALID_AKMP 20 -#define REASON_UNSUPPORTED_RSNIE_VERSION 21 -#define REASON_INVALID_RSNIE_CAPABILITY 22 -#define REASON_802_1X_AUTH_FAIL 23 -#define REASON_CIPHER_REJECT_PER_SEC_POLICY 14 - -/* -//=========================================================== -// enum_MMPDUResultCode -- -// Status code (2 Octs) in the MMPDU's frame body. Table.19 -// -//=========================================================== -enum enum_MMPDUResultCode -{ -// SUCCESS = 0, // Redefined -UNSPECIFIED_FAILURE = 1, - -// 2 - 9 Reserved - -NOT_SUPPROT_CAPABILITIES = 10, - -//REASSOCIATION_DENIED -// -REASSOC_DENIED_UNABLE_CFM_ASSOC_EXIST = 11, - -//ASSOCIATION_DENIED_NOT_IN_STANDARD -// -ASSOC_DENIED_REASON_NOT_IN_STANDARD = 12, -PEER_NOT_SUPPORT_AUTH_ALGORITHM = 13, -AUTH_SEQNUM_OUT_OF_EXPECT = 14, -AUTH_REJECT_REASON_CHALLENGE_FAIL = 15, -AUTH_REJECT_REASON_WAIT_TIMEOUT = 16, -ASSOC_DENIED_REASON_AP_BUSY = 17, -ASSOC_DENIED_REASON_NOT_SUPPORT_BASIC_RATE = 18 -} WB_MMPDURESULTCODE, *PWB_MMPDURESULTCODE; -*/ - -#define RATE_BITMAP_1M 1 -#define RATE_BITMAP_2M 2 -#define RATE_BITMAP_5dot5M 5 -#define RATE_BITMAP_6M 6 -#define RATE_BITMAP_9M 9 -#define RATE_BITMAP_11M 11 -#define RATE_BITMAP_12M 12 -#define RATE_BITMAP_18M 18 -#define RATE_BITMAP_22M 22 -#define RATE_BITMAP_24M 24 -#define RATE_BITMAP_33M 17 -#define RATE_BITMAP_36M 19 -#define RATE_BITMAP_48M 25 -#define RATE_BITMAP_54M 28 -#define RATE_AUTO 0#define RATE_1M 2#define RATE_2M 4
@@ -206,365 +68,4 @@ enum enum_MMPDUResultCode#define RATE_54M 108#define RATE_MAX 255 -/* CAPABILITY */ -#define CAPABILITY_ESS_BIT 0x0001 -#define CAPABILITY_IBSS_BIT 0x0002 -#define CAPABILITY_CF_POLL_BIT 0x0004 -#define CAPABILITY_CF_POLL_REQ_BIT 0x0008 -#define CAPABILITY_PRIVACY_BIT 0x0010 -#define CAPABILITY_SHORT_PREAMBLE_BIT 0x0020 -#define CAPABILITY_PBCC_BIT 0x0040 -#define CAPABILITY_CHAN_AGILITY_BIT 0x0080 -#define CAPABILITY_SHORT_SLOT_TIME_BIT 0x0400 -#define CAPABILITY_DSSS_OFDM_BIT 0x2000 - - -struct Capability_Information_Element { -union { -u16 __attribute__ ((packed)) wValue; -#ifdef _BIG_ENDIAN_/* 20060926 add by anson's endian */ -struct _Capability { -/* -- 11G -- */ -u8 Reserved3:2 ; -u8 DSSS_OFDM:1 ; -u8 Reserved2:2 ; -u8 Short_Slot_Time:1 ; -u8 Reserved1:2 ; -u8 Channel_Agility:1 ; -u8 PBCC:1 ; -u8 ShortPreamble:1 ; -u8 CF_Privacy:1 ; -u8 CF_Poll_Request:1 ; -u8 CF_Pollable:1 ; -u8 IBSS:1 ; -u8 ESS:1 ; - } __attribute__ ((packed)) Capability; -#else -struct _Capability { -u8 ESS:1 ; -u8 IBSS:1 ; -u8 CF_Pollable:1 ; -u8 CF_Poll_Request:1 ; -u8 CF_Privacy:1 ; -u8 ShortPreamble:1 ; -u8 PBCC:1 ; -u8 Channel_Agility:1 ; -u8 Reserved1:2 ; -/* -- 11G -- */ -u8 Short_Slot_Time:1 ; -u8 Reserved2:2 ; -u8 DSSS_OFDM:1 ; -u8 Reserved3:2 ; - } __attribute__ ((packed)) Capability; -#endif - } __attribute__ ((packed)) ; -} __attribute__ ((packed)); - -struct FH_Parameter_Set_Element { -u8 Element_ID; -u8 Length; -u8 Dwell_Time[2 ]; -u8 Hop_Set; -u8 Hop_Pattern; -u8 Hop_Index; -}; - -struct DS_Parameter_Set_Element { -u8 Element_ID; -u8 Length; -u8 Current_Channel; -}; - -struct Supported_Rates_Element { -u8 Element_ID; -u8 Length; -u8 SupportedRates[8 ]; -} __attribute__ ((packed)); - -struct SSID_Element { -u8 Element_ID; -u8 Length; -u8 SSID[32 ]; -} __attribute__ ((packed)) ; - -struct CF_Parameter_Set_Element { -u8 Element_ID; -u8 Length; -u8 CFP_Count; -u8 CFP_Period; -u8 CFP_MaxDuration[2 ];/* in Time Units */ -u8 CFP_DurRemaining[2 ];/* in time units */ -}; - -struct TIM_Element { -u8 Element_ID; -u8 Length; -u8 DTIM_Count; -u8 DTIM_Period; -u8 Bitmap_Control; -u8 Partial_Virtual_Bitmap[251 ]; -}; - -struct IBSS_Parameter_Set_Element { -u8 Element_ID; -u8 Length; -u8 ATIM_Window[2 ]; -}; - -struct Challenge_Text_Element { -u8 Element_ID; -u8 Length; -u8 Challenge_Text[253 ]; -}; - -struct PHY_Parameter_Set_Element { -/* int aSlotTime; */ -/* int aSifsTime; */ -s32 aCCATime; -s32 aRxTxTurnaroundTime; -s32 aTxPLCPDelay; -s32 RxPLCPDelay; -s32 aRxTxSwitchTime; -s32 aTxRampOntime; -s32 aTxRampOffTime; -s32 aTxRFDelay; -s32 aRxRFDelay; -s32 aAirPropagationTime; -s32 aMACProcessingDelay; -s32 aPreambleLength; -s32 aPLCPHeaderLength; -s32 aMPDUDurationFactor; -s32 aMPDUMaxLength; -/* int aCWmin; */ -/* int aCWmax; */ -}; - -/* -- 11G -- */ -struct ERP_Information_Element { -u8 Element_ID; -u8 Length; -#ifdef _BIG_ENDIAN_/* 20060926 add by anson's endian */ -u8 Reserved:5 ;/* 20060926 add by anson */ -u8 Barker_Preamble_Mode:1 ; -u8 Use_Protection:1 ; -u8 NonERP_Present:1 ; -#else -u8 NonERP_Present:1 ; -u8 Use_Protection:1 ; -u8 Barker_Preamble_Mode:1 ; -u8 Reserved:5 ; -#endif -}; - -struct Extended_Supported_Rates_Element { -u8 Element_ID; -u8 Length; -u8 ExtendedSupportedRates[255 ]; -} __attribute__ ((packed)); - -/* WPA(802.11i draft 3.0) */ -#define VERSION_WPA 1 -/* WPA2.0 OUI=00:50:F2, the MSB is reserved for suite type */ -#define OUI_WPA 0x00F25000 - -#define OUI_WPA_ADDITIONAL 0x01 -#define WLAN_MIN_RSN_WPA_LENGTH 6/* added by ws 09/10/04 */ - -#define oui_wpa (u32)(OUI_WPA|OUI_WPA_ADDITIONAL) - -#define WPA_OUI_BIG ((u32) 0x01F25000)/* added by ws 09/23/04 */ -#define WPA_OUI_LITTLE ((u32) 0x01F25001)/* added by ws 09/23/04 */ -/* 20061108 For WPS. It's little endian. Big endian is 0x0050F204 */ -#define WPA_WPS_OUI cpu_to_le32(0x04F25000) - -/* Authentication suite */ -#define OUI_AUTH_WPA_NONE 0x00/* for WPA_NONE */ -#define OUI_AUTH_8021X 0x01 -#define OUI_AUTH_PSK 0x02 -/* Cipher suite */ -#define OUI_CIPHER_GROUP_KEY 0x00/* added by ws 05/21/04 */ -#define OUI_CIPHER_WEP_40 0x01 -#define OUI_CIPHER_TKIP 0x02 -#define OUI_CIPHER_CCMP 0x04 -#define OUI_CIPHER_WEP_104 0x05 - -struct suite_selector { -union { -u8 Value[4 ]; -struct _SUIT_ { -u8 OUI[3 ]; -u8 Type; - } SuitSelector; - }; -}; - -/* -- WPA -- */ -struct RSN_Information_Element { -u8 Element_ID; -u8 Length; -/* WPA version 2.0 additional field, and should be 00:50:F2:01 */ -struct suite_selector OuiWPAAdditional; -u16 Version; -struct suite_selector GroupKeySuite; -u16 PairwiseKeySuiteCount; -struct suite_selector PairwiseKeySuite[1 ]; -} __attribute__ ((packed)); -struct RSN_Auth_Sub_Information_Element { -u16 AuthKeyMngtSuiteCount; -struct suite_selector AuthKeyMngtSuite[1 ]; -} __attribute__ ((packed)); - -/* -- WPA2 -- */ -struct RSN_Capability_Element { -union { -u16 __attribute__ ((packed)) wValue; -#ifdef _BIG_ENDIAN_/* 20060927 add by anson's endian */ -struct _RSN_Capability { -u16 __attribute__ ((packed)) Reserved2:8 ;/* 20051201 */ -u16 __attribute__ ((packed)) Reserved1:2 ; -u16 __attribute__ ((packed)) GTK_Replay_Counter:2 ; -u16 __attribute__ ((packed)) PTK_Replay_Counter:2 ; -u16 __attribute__ ((packed)) No_Pairwise:1 ; -u16 __attribute__ ((packed)) Pre_Auth:1 ; - } __attribute__ ((packed)) RSN_Capability; -#else -struct _RSN_Capability { -u16 __attribute__ ((packed)) Pre_Auth:1 ; -u16 __attribute__ ((packed)) No_Pairwise:1 ; -u16 __attribute__ ((packed)) PTK_Replay_Counter:2 ; -u16 __attribute__ ((packed)) GTK_Replay_Counter:2 ; -u16 __attribute__ ((packed)) Reserved1:2 ; -u16 __attribute__ ((packed)) Reserved2:8 ;/* 20051201 */ - } __attribute__ ((packed)) RSN_Capability; -#endif - - } __attribute__ ((packed)) ; -} __attribute__ ((packed)) ; - -/*============================================================ -// MAC Frame structure (different type) and subfield structure -//============================================================*/ -struct MAC_frame_control { -/* a combination of the [Protocol Version, Control Type, Control Subtype]*/ -u8 mac_frame_info; -/* 20060927 add by anson's endian */ -#ifdef _BIG_ENDIAN_ -u8 order:1 ; -u8 WEP:1 ; -u8 more_data:1 ; -u8 pwr_mgt:1 ; -u8 retry:1 ; -u8 more_frag:1 ; -u8 from_ds:1 ; -u8 to_ds:1 ; -#else -u8 to_ds:1 ; -u8 from_ds:1 ; -u8 more_frag:1 ; -u8 retry:1 ; -u8 pwr_mgt:1 ; -u8 more_data:1 ; -u8 WEP:1 ; -u8 order:1 ; -#endif -} __attribute__ ((packed)); - -struct Management_Frame { -/* 2B, ToDS,FromDS,MoreFrag,MoreData,Order=0 */ -struct MAC_frame_control frame_control; -u16 duration; -u8 DA[MAC_ADDR_LENGTH ];/* Addr1 */ -u8 SA[MAC_ADDR_LENGTH ];/* Addr2 */ -u8 BSSID[MAC_ADDR_LENGTH ];/* Addr3 */ -u16 Sequence_Control; -/* Management Frame Body <= 325 bytes */ -/* FCS 4 bytes */ -} __attribute__ ((packed)); - -/* SW-MAC don't Tx/Rx Control-Frame, HW-MAC do it. */ -struct Control_Frame { -/* ToDS,FromDS,MoreFrag,Retry,MoreData,WEP,Order=0 */ -struct MAC_frame_control frame_control; -u16 duration; -u8 RA[MAC_ADDR_LENGTH ]; -u8 TA[MAC_ADDR_LENGTH ]; -u16 FCS; -} __attribute__ ((packed)); - -struct Data_Frame { -struct MAC_frame_control frame_control; -u16 duration; -u8 Addr1[MAC_ADDR_LENGTH ]; -u8 Addr2[MAC_ADDR_LENGTH ]; -u8 Addr3[MAC_ADDR_LENGTH ]; -u16 Sequence_Control; -u8 Addr4[MAC_ADDR_LENGTH ];/* only exist when ToDS=FromDS=1 */ -/* Data Frame Body <= 2312 */ -/* FCS */ -} __attribute__ ((packed)); - -struct Disassociation_Frame_Body { -u16 reasonCode; -} __attribute__ ((packed)); - -struct Association_Request_Frame_Body { -u16 capability_information; -u16 listenInterval; -u8 Current_AP_Address[MAC_ADDR_LENGTH ];/* for reassociation only */ -/* SSID (2+32 bytes) */ -/* Supported_Rates (2+8 bytes) */ -} __attribute__ ((packed)); - -struct Association_Response_Frame_Body { -u16 capability_information; -u16 statusCode; -u16 Association_ID; -struct Supported_Rates_Element supportedRates; -} __attribute__ ((packed)); - -/*struct Reassociation_Request_Frame_Body -{ -u16 capability_information; -u16 listenInterval; -u8 Current_AP_Address[MAC_ADDR_LENGTH]; -// SSID (2+32 bytes) -// Supported_Rates (2+8 bytes) -};*/ -/* eliminated by WS 07/22/04 comboined with associateion request frame. */ - -struct Reassociation_Response_Frame_Body { -u16 capability_information; -u16 statusCode; -u16 Association_ID; -struct Supported_Rates_Element supportedRates; -} __attribute__ ((packed)); - -struct Deauthentication_Frame_Body { -u16 reasonCode; -} __attribute__ ((packed)); - - -struct Probe_Response_Frame_Body { -u16 Timestamp; -u16 Beacon_Interval; -u16 Capability_Information; -/* SSID -// Supported_Rates -// PHY parameter Set (DS Parameters) -// CF parameter Set -// IBSS parameter Set */ -} __attribute__ ((packed)); - -struct Authentication_Frame_Body { -u16 algorithmNumber; -u16 sequenceNumber; -u16 statusCode; -/* NB: don't include ChallengeText in this structure -// struct Challenge_Text_Element sChallengeTextElement; -// wkchen added */ -} __attribute__ ((packed)); - -#endif /* _MAC_Structure_H_ */ - -
Signature · 1 line
1.7.0.4
PATCH 5/13 w35und: Use pr_debug() for debugging
In reply to Pekka EnbergUse pr_debug() for debugging printk's and kill the FULL_DEBUG macro. It would be even better to use dev_dbg() but unfortunately looking up struct device in the current code structure makes things very ugly.
Please note that I dropped the DataDmp() calls from RFSynthesizer_SwitchingChannel() because that function doesn't exist.
--- drivers/staging/winbond/mds.c | 16 ++++------------ drivers/staging/winbond/reg.c | 27 +++++---------------------- drivers/staging/winbond/sysdef.h | 12 ------------ drivers/staging/winbond/wb35reg.c | 20 +++++--------------- drivers/staging/winbond/wb35rx.c | 21 +++++---------------- drivers/staging/winbond/wb35tx.c | 16 ++++------------ drivers/staging/winbond/wbusb.c | 13 +++---------- 7 files changed, 26 insertions(+), 99 deletions(-)
drivers/staging/winbond/mds.c +4 -12
@@ -346,9 +346,7 @@ static void Mds_HeaderCopy(struct wbsoft_priv *adapter, struct wb35_descriptor * ctmp1 = ctmpf =CURRENT_TX_RATE_FOR_MNG ; pDes->TxRate = ctmp1; -#ifdef _PE_TX_DUMP_ -printk ("Tx rate =%x\n" , ctmp1); -#endif +pr_debug ("Tx rate =%x\n" , ctmp1); pT01->T01_modulation_type = (ctmp1%3 ) ?0 :1 ;
@@ -426,9 +424,7 @@ Mds_Tx(struct wbsoft_priv *adapter) do { FillIndex = pMds->TxFillIndex; if (pMds->TxOwner[FillIndex]) { /* Is owned by software 0:Yes 1:No */ -#ifdef _PE_TX_DUMP_ - printk("[Mds_Tx] Tx Owner is H/W.\n"); -#endif + pr_debug("[Mds_Tx] Tx Owner is H/W.\n"); break; }
@@ -472,9 +468,7 @@ Mds_Tx(struct wbsoft_priv *adapter)/* For speed up Key setting */ if (pTxDes->EapFix) { -#ifdef _PE_TX_DUMP_ -printk ("35: EPA 4th frame detected. Size = %d\n" , PacketSize); -#endif +pr_debug ("35: EPA 4th frame detected. Size = %d\n" , PacketSize); pHwData->IsKeyPreSet =1 ; }
@@ -563,9 +557,7 @@ Mds_SendComplete(struct wbsoft_priv *adapter, struct T02_descriptor *pT02) pHwData->tx_retry_count[RetryCount] += RetryCount; else pHwData->tx_retry_count[7] += RetryCount; -#ifdef _PE_STATE_DUMP_ -printk ("dto_tx_retry_count =%d\n" , pHwData->dto_tx_retry_count); -#endif +pr_debug ("dto_tx_retry_count =%d\n" , pHwData->dto_tx_retry_count);MTO_SetTxCount (adapter, TxRate, RetryCount); } pHwData->dto_tx_frag_count += (RetryCount+1 );
drivers/staging/winbond/reg.c +5 -22
@@ -1012,9 +1012,7 @@ void RFSynthesizer_initial(struct hw_data *pHwData)case RF_AIROHA_7230 :/* Start to fill RF parameters, PLL_ON should be pulled low. */ Wb35Reg_WriteSync (pHwData,0x03dc ,0x00000000 ); -#ifdef _PE_STATE_DUMP_ -printk ("* PLL_ON low\n" ); -#endif +pr_debug ("* PLL_ON low\n" ); number =ARRAY_SIZE (al7230_rf_data_24);Set_ChanIndep_RfData_al7230_24 (pHwData, pltmp, number);break ;
@@ -1100,9 +1098,7 @@ void RFSynthesizer_initial(struct hw_data *pHwData)case RF_AIROHA_7230 :/* RF parameters have filled completely, PLL_ON should be pulled high */ Wb35Reg_WriteSync (pHwData,0x03dc ,0x00000080 ); -#ifdef _PE_STATE_DUMP_ -printk ("* PLL_ON high\n" ); -#endif +pr_debug ("* PLL_ON high\n" );/* 2.4GHz */ ltmp = (1 <<31 ) | (0 <<30 ) | (24 <<24 ) |0x9ABA8F ;
@@ -1117,9 +1113,7 @@ void RFSynthesizer_initial(struct hw_data *pHwData)/* 5GHz */ Wb35Reg_WriteSync (pHwData,0x03dc ,0x00000000 ); -#ifdef _PE_STATE_DUMP_ -printk ("* PLL_ON low\n" ); -#endif +pr_debug ("* PLL_ON low\n" ); number =ARRAY_SIZE (al7230_rf_data_50);Set_ChanIndep_RfData_al7230_50 (pHwData, pltmp, number);
@@ -1129,9 +1123,7 @@ void RFSynthesizer_initial(struct hw_data *pHwData)msleep (5 );Wb35Reg_WriteSync (pHwData,0x03dc ,0x00000080 ); -#ifdef _PE_STATE_DUMP_ -printk ("* PLL_ON high\n" ); -#endif +pr_debug ("* PLL_ON high\n" ); ltmp = (1 <<31 ) | (0 <<30 ) | (24 <<24 ) |0x9ABA8F ;Wb35Reg_WriteSync (pHwData,0x0864 , ltmp);
@@ -1797,9 +1789,7 @@ void RFSynthesizer_SwitchingChannel(struct hw_data *pHwData, struct chan_info C/* Write to register. number must less and equal than 16 */ Wb35Reg_BurstWrite (pHwData,0x0864 , pltmp, number,NO_INCREMENT ); -#ifdef _PE_STATE_DUMP_ -printk ("Band changed\n" ); -#endif +pr_debug ("Band changed\n" ); }if (Channel.band <=BAND_TYPE_OFDM_24 ) {/* channel 1 ~ 14 */
@@ -2338,13 +2328,6 @@ void EEPROMTxVgaAdjust(struct hw_data *pHwData) pHwData->TxVgaFor50[32 ].TxVgaValue = pTxVga[17 ] - stmp *2 /4 ; pHwData->TxVgaFor50[31 ].TxVgaValue = pTxVga[17 ] - stmp *3 /4 ; } - -#ifdef _PE_STATE_DUMP_ -printk (" TxVgaFor24 :\n" ); -DataDmp ((u8 *)pHwData->TxVgaFor24,14 ,0 ); -printk (" TxVgaFor50 :\n" ); -DataDmp ((u8 *)pHwData->TxVgaFor50,70 ,0 ); -#endif }void BBProcessor_RateChanging (struct hw_data *pHwData,u8 rate)
drivers/staging/winbond/sysdef.h +0 -12
@@ -3,16 +3,4 @@#ifndef SYS_DEF_H #define SYS_DEF_H -/* debug print options, mark what debug you don't need */ - -#ifdef FULL_DEBUG -#define _PE_STATE_DUMP_ -#define _PE_TX_DUMP_ -#define _PE_RX_DUMP_ -#define _PE_OID_DUMP_ -#define _PE_DTO_DUMP_ -#define _PE_REG_DUMP_ -#define _PE_USB_INI_DUMP_ -#endif -#endif
drivers/staging/winbond/wb35reg.c +5 -15
@@ -150,9 +150,7 @@ unsigned char Wb35Reg_WriteSync(struct hw_data *pHwData, u16 RegisterNo, u32 RegWb35Reg_EP0VM_start (pHwData);if (ret <0 ) { -#ifdef _PE_REG_DUMP_ -printk ("EP0 Write register usb message sending error\n" ); -#endif +pr_debug ("EP0 Write register usb message sending error\n" ); pHwData->SurpriseRemove =1 ;return false; }
@@ -320,9 +318,7 @@ unsigned char Wb35Reg_ReadSync(struct hw_data *pHwData, u16 RegisterNo, u32 *pReWb35Reg_EP0VM_start (pHwData);if (ret <0 ) { -#ifdef _PE_REG_DUMP_ -printk ("EP0 Read register usb message sending error\n" ); -#endif +pr_debug ("EP0 Read register usb message sending error\n" ); pHwData->SurpriseRemove =1 ;return false; }
@@ -442,9 +438,7 @@ void Wb35Reg_EP0VM(struct hw_data *pHwData) ret =usb_submit_urb (urb,GFP_ATOMIC );if (ret <0 ) { -#ifdef _PE_REG_DUMP_ -printk ("EP0 Irp sending error\n" ); -#endif +pr_debug ("EP0 Irp sending error\n" ); goto cleanup; }return ;
@@ -479,9 +473,7 @@ void Wb35Reg_EP0VM_complete(struct urb *urb)spin_unlock_irq (®->EP0VM_spin_lock);if (reg->EP0VM_status) { -#ifdef _PE_REG_DUMP_ -printk ("EP0 IoCompleteRoutine return error\n" ); -#endif +pr_debug ("EP0 IoCompleteRoutine return error\n" ); reg->EP0vm_state =VM_STOP ; pHwData->SurpriseRemove =1 ; }else {
@@ -526,9 +518,7 @@ void Wb35Reg_destroy(struct hw_data *pHwData)usb_free_urb (urb);kfree (reg_queue); }else { -#ifdef _PE_REG_DUMP_ -printk ("EP0 queue release error\n" ); -#endif +pr_debug ("EP0 queue release error\n" ); }spin_lock_irq (®->EP0VM_spin_lock);
drivers/staging/winbond/wb35rx.c +5 -16
@@ -109,10 +109,7 @@ static u16 Wb35Rx_indicate(struct ieee80211_hw *hw)/* Basic check for Rx length. Is length valid? */ if (PacketSize >MAX_PACKET_SIZE ) { -#ifdef _PE_RX_DUMP_ -printk ("Serious ERROR : Rx data size too long, size =%d\n" , PacketSize); -#endif - +pr_debug ("Serious ERROR : Rx data size too long, size =%d\n" , PacketSize); pWb35Rx->EP3vm_state =VM_STOP ; pWb35Rx->Ep3ErrorCount2++;break ;
@@ -186,9 +183,7 @@ static void Wb35Rx_Complete(struct urb *urb)/* The URB is completed, check the result */ if (pWb35Rx->EP3VM_status !=0 ) { -#ifdef _PE_USB_STATE_DUMP_ -printk ("EP3 IoCompleteRoutine return error\n" ); -#endif +pr_debug ("EP3 IoCompleteRoutine return error\n" ); pWb35Rx->EP3vm_state =VM_STOP ; goto error; }
@@ -249,9 +244,7 @@ static void Wb35Rx(struct ieee80211_hw *hw) RxBufferId = pWb35Rx->RxBufferId;if (!pWb35Rx->RxOwner[RxBufferId]) {/* It's impossible to run here. */ -#ifdef _PE_RX_DUMP_ -printk ("Rx driver fifo unavailable\n" ); -#endif +pr_debug ("Rx driver fifo unavailable\n" ); goto error; }
@@ -337,9 +330,7 @@ void Wb35Rx_stop(struct hw_data *pHwData)/* Canceling the Irp if already sends it out. */ if (pWb35Rx->EP3vm_state ==VM_RUNNING ) {usb_unlink_urb (pWb35Rx->RxUrb);/* Only use unlink, let Wb35Rx_destroy to free them */ -#ifdef _PE_RX_DUMP_ -printk ("EP3 Rx stop\n" ); -#endif +pr_debug ("EP3 Rx stop\n" ); } }
@@ -355,8 +346,6 @@ void Wb35Rx_destroy(struct hw_data *pHwData)if (pWb35Rx->RxUrb)usb_free_urb (pWb35Rx->RxUrb); -#ifdef _PE_RX_DUMP_ -printk ("Wb35Rx_destroy OK\n" ); -#endif +pr_debug ("Wb35Rx_destroy OK\n" ); }
drivers/staging/winbond/wb35tx.c +4 -12
@@ -153,16 +153,12 @@ void Wb35Tx_stop(struct hw_data * pHwData)// Trying to canceling the Trp of EP2 if (pWb35Tx->EP2vm_state ==VM_RUNNING )usb_unlink_urb ( pWb35Tx->Tx2Urb );// Only use unlink, let Wb35Tx_destrot to free them -#ifdef _PE_TX_DUMP_ -printk ("EP2 Tx stop\n" ); -#endif +pr_debug ("EP2 Tx stop\n" );// Trying to canceling the Irp of EP4 if (pWb35Tx->EP4vm_state ==VM_RUNNING )usb_unlink_urb ( pWb35Tx->Tx4Urb );// Only use unlink, let Wb35Tx_destrot to free them -#ifdef _PE_TX_DUMP_ -printk ("EP4 Tx stop\n" ); -#endif +pr_debug ("EP4 Tx stop\n" ); }//======================================================
@@ -182,9 +178,7 @@ void Wb35Tx_destroy(struct hw_data * pHwData)if (pWb35Tx->Tx2Urb)usb_free_urb ( pWb35Tx->Tx2Urb ); -#ifdef _PE_TX_DUMP_ -printk ("Wb35Tx_destroy OK\n" ); -#endif +pr_debug ("Wb35Tx_destroy OK\n" ); }void Wb35Tx_CurrentTime (struct wbsoft_priv *adapter,u32 TimeCount)
@@ -279,9 +273,7 @@ static void Wb35Tx_EP2VM(struct wbsoft_priv *adapter) retv =usb_submit_urb (pUrb,GFP_ATOMIC );if (retv <0 ) { -#ifdef _PE_TX_DUMP_ -printk ("EP2 Tx Irp sending error\n" ); -#endif +pr_debug ("EP2 Tx Irp sending error\n" ); goto error; }
drivers/staging/winbond/wbusb.c +3 -10
@@ -184,10 +184,7 @@ static void hal_set_current_channel_ex(struct hw_data *pHwData, struct chan_infoRFSynthesizer_SwitchingChannel (pHwData, channel);/* Switch channel */ pHwData->Channel = channel.ChanNo; pHwData->band = channel.band; -#ifdef _PE_STATE_DUMP_ -printk ("Set channel is %d, band =%d\n" , pHwData->Channel, - pHwData->band); -#endif +pr_debug ("Set channel is %d, band =%d\n" , pHwData->Channel, pHwData->band); reg->M28_MacControl &= ~0xff ;/* Clean channel information field */ reg->M28_MacControl |= channel.ChanNo; Wb35Reg_WriteWithCallbackValue(pHwData, 0x0828, reg->M28_MacControl,
@@ -728,9 +725,7 @@ static int wb35_hw_init(struct ieee80211_hw *hw) } priv->sLocalPara.bAntennaNo =hal_get_antenna_number (pHwData); -#ifdef _PE_STATE_DUMP_ -printk ("Driver init, antenna no = %d\n" , psLOCAL->bAntennaNo); -#endif +pr_debug ("Driver init, antenna no = %d\n" , priv->sLocalPara.bAntennaNo);hal_get_hw_radio_off (pHwData);/* Waiting for HAL setting OK */
@@ -856,9 +851,7 @@ static void wb35_hw_halt(struct wbsoft_priv *adapter) {/* Turn off Rx and Tx hardware ability */ hal_stop (&adapter->sHwData); -#ifdef _PE_USB_INI_DUMP_ -printk ("[w35und] Hal_stop O.K.\n" ); -#endif +pr_debug ("[w35und] Hal_stop O.K.\n" );/* Waiting Irp completed */ msleep (100 );
Signature · 1 line
1.7.0.4
PATCH 6/13 w35und: Remove empty sysdef.h header
In reply to Pekka EnbergThe sysdef.h header is empty now so kill it.
--- drivers/staging/winbond/mds.c | 1 - drivers/staging/winbond/mlmetxrx.c | 2 -- drivers/staging/winbond/mto.c | 1 - drivers/staging/winbond/phy_calibration.c | 1 - drivers/staging/winbond/reg.c | 1 - drivers/staging/winbond/sysdef.h | 6 ------ drivers/staging/winbond/wb35reg.c | 1 - drivers/staging/winbond/wb35rx.c | 1 - drivers/staging/winbond/wb35tx.c | 1 - 9 files changed, 0 insertions(+), 15 deletions(-) delete mode 100644 drivers/staging/winbond/sysdef.h
drivers/staging/winbond/mds.c +0 -1
@@ -1,7 +1,6 @@#include "mds_f.h" #include "mlmetxrx_f.h" #include "mto.h" -#include "sysdef.h" #include "wbhal.h" #include "wblinux_f.h" #include "wb35tx_f.h"
drivers/staging/winbond/mlmetxrx.c +0 -2
@@ -15,8 +15,6 @@Copyright (c) 1996-2002 Winbond Electronics Corp. All Rights Reserved. ============================================================================ */ -#include "sysdef.h" -#include "mds_f.h" void MLME_GetNextPacket (struct wbsoft_priv *adapter,struct wb35_descriptor *desc)
drivers/staging/winbond/mto.c +0 -1
@@ -17,7 +17,6 @@* ============================================================================ */ -#include "sysdef.h" #include "sme_api.h" #include "wbhal.h" #include "wb35reg_f.h"
drivers/staging/winbond/phy_calibration.c +0 -1
@@ -10,7 +10,6 @@*/ /****************** INCLUDE FILES SECTION ***********************************/ -#include "sysdef.h" #include "phy_calibration.h" #include "wbhal.h" #include "wb35reg_f.h"
drivers/staging/winbond/reg.c +0 -1
@@ -1,4 +1,3 @@ -#include "sysdef.h" #include "wbhal.h" #include "wb35reg_f.h" #include "core.h"
drivers/staging/winbond/sysdef.h deleted +0 -6
@@ -1,6 +0,0 @@ -/* Winbond WLAN System Configuration defines */ - -#ifndef SYS_DEF_H -#define SYS_DEF_H - -#endif
drivers/staging/winbond/wb35reg.c +0 -1
@@ -1,4 +1,3 @@ -#include "sysdef.h" #include "wb35reg_f.h" #include <linux/usb.h>
drivers/staging/winbond/wb35rx.c +0 -1
@@ -14,7 +14,6 @@#include <linux/slab.h> #include "core.h" -#include "sysdef.h" #include "wb35rx_f.h" static void packet_came (struct ieee80211_hw *hw,char *pRxBufferAddress,int PacketSize)
drivers/staging/winbond/wb35tx.c +0 -1
@@ -13,7 +13,6 @@#include "wb35tx_f.h" #include "mds_f.h" -#include "sysdef.h" unsigned char Wb35Tx_get_tx_buffer (struct hw_data * pHwData,u8 **pBuffer)
Signature · 1 line
1.7.0.4
PATCH 7/13 w35und: Kill Vendor2 ifdef from hal_init_hardware
In reply to Pekka EnbergThe Vendor2 macro is never defined so remove the ifdef'd block from hal_init_hardware().
--- drivers/staging/winbond/wbusb.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-)
drivers/staging/winbond/wbusb.c +0 -7
@@ -642,13 +642,6 @@ static int hal_init_hardware(struct ieee80211_hw *hw) SoftwareSet =hal_software_set (pHwData); -#ifdef Vendor2 -/* Try to make sure the EEPROM contain */ - SoftwareSet >>=8 ; -if (SoftwareSet !=0x82 ) -return false; -#endif -Wb35Rx_start (hw);Wb35Tx_EP2VM_start (priv);
Signature · 1 line
1.7.0.4
PATCH 8/13 w35und: Kill write-only ->TxToggle
In reply to Pekka EnbergThis patch removes ->TxToggle from struct wb35_mds because it's a write only struct member.
--- drivers/staging/winbond/mds.c | 5 ----- drivers/staging/winbond/mds_s.h | 4 ---- 2 files changed, 0 insertions(+), 9 deletions(-)
drivers/staging/winbond/mds.c +0 -5
@@ -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);
drivers/staging/winbond/mds_s.h +0 -4
@@ -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;
Signature · 1 line
1.7.0.4
PATCH 9/13 w35und: Kill _IBSS_BEACON_SEQ_STICK_
In reply to Pekka EnbergThis patch kills the _IBSS_BEACON_SEQ_STICK_ ifdefs because the macro is never defined.
--- drivers/staging/winbond/mlmetxrx_f.h | 4 ---- drivers/staging/winbond/reg.c | 4 ---- 2 files changed, 0 insertions(+), 8 deletions(-)
drivers/staging/winbond/mlmetxrx_f.h +0 -4
@@ -16,8 +16,4 @@ void MLME_SendComplete(struct wbsoft_priv *adapter, u8 PacketID, unsigned char SendOK); -#ifdef _IBSS_BEACON_SEQ_STICK_ -s8 SendBCNullData (struct wbsoft_priv *adapter,u16 wIdx); -#endif -#endif
drivers/staging/winbond/reg.c +0 -4
@@ -2064,11 +2064,7 @@ void Mxx_initial(struct hw_data *pHwData)*/ /* M00 bit set */ -#ifdef _IBSS_BEACON_SEQ_STICK_ - reg->M00_MacControl =0 ;/* Solve beacon sequence number stop by software */ -#else reg->M00_MacControl =0x80000000 ;/* Solve beacon sequence number stop by hardware */ -#endif /* M24 disable enter power save, BB RxOn and enable NAV attack */ reg->M24_MacControl =0x08040042 ;
Signature · 1 line
1.7.0.4
PATCH 10/13 w35und: Merge mlmetxrx.c to mds.c
In reply to Pekka EnbergThis patch merges mlmetxrx.c to mds.c because it's small and the functions are only used in mto.c.
--- drivers/staging/winbond/Makefile | 1 - drivers/staging/winbond/mds.c | 39 +++++++++++++++++++++- drivers/staging/winbond/mlmetxrx.c | 60 ---------------------------------- drivers/staging/winbond/mlmetxrx_f.h | 19 ----------- drivers/staging/winbond/wbusb.c | 1 - 5 files changed, 38 insertions(+), 82 deletions(-) delete mode 100644 drivers/staging/winbond/mlmetxrx.c delete mode 100644 drivers/staging/winbond/mlmetxrx_f.h
drivers/staging/winbond/Makefile +0 -1
@@ -1,6 +1,5 @@ w35und-y := \ mds.o \ - mlmetxrx.o \ mto.o \ phy_calibration.o \ reg.o \
drivers/staging/winbond/mds.c +38 -1
@@ -1,5 +1,4 @@#include "mds_f.h" -#include "mlmetxrx_f.h" #include "mto.h" #include "wbhal.h" #include "wblinux_f.h"
@@ -397,6 +396,44 @@ static void Mds_HeaderCopy(struct wbsoft_priv *adapter, struct wb35_descriptor * } +static void MLME_GetNextPacket (struct wbsoft_priv *adapter,struct wb35_descriptor *desc) +{ + desc->InternalUsed = desc->buffer_start_index + desc->buffer_number; + desc->InternalUsed %=MAX_DESCRIPTOR_BUFFER_INDEX ; + desc->buffer_address[desc->InternalUsed] = adapter->sMlmeFrame.pMMPDU; + desc->buffer_size[desc->InternalUsed] = adapter->sMlmeFrame.len; + desc->buffer_total_size += adapter->sMlmeFrame.len; + desc->buffer_number++; + desc->Type = adapter->sMlmeFrame.DataType; +} + +static void MLMEfreeMMPDUBuffer (struct wbsoft_priv *adapter,s8 *pData) +{ +int i; + +/* Reclaim the data buffer */ +for (i =0 ; i <MAX_NUM_TX_MMPDU ; i++) { +if (pData == (s8 *)&(adapter->sMlmeFrame.TxMMPDU[i])) +break ; + } +if (adapter->sMlmeFrame.TxMMPDUInUse[i]) + adapter->sMlmeFrame.TxMMPDUInUse[i] = false; +else { +/* Something wrong +PD43 Add debug code here??? */ + } +} + +static void MLME_SendComplete (struct wbsoft_priv *adapter,u8 PacketID,unsigned char SendOK) +{ +/* Reclaim the data buffer */ + adapter->sMlmeFrame.len =0 ; +MLMEfreeMMPDUBuffer (adapter, adapter->sMlmeFrame.pMMPDU); + +/* Return resource */ + adapter->sMlmeFrame.IsInUsed =PACKET_FREE_TO_USE ; +} +void Mds_Tx (struct wbsoft_priv *adapter) {
drivers/staging/winbond/mlmetxrx.c deleted +0 -60
60 lines not on this page · raw message
drivers/staging/winbond/mlmetxrx_f.h deleted +0 -19
@@ -1,19 +0,0 @@ -/* ================================================================ -// MLMETxRx.H -- -// -// Functions defined in MLMETxRx.c. -// -// Copyright (c) 2002 Winbond Electrics Corp. All Rights Reserved. -//================================================================ */ -#ifndef _MLMETXRX_H -#define _MLMETXRX_H - -#include "core.h" - -void MLME_GetNextPacket (struct wbsoft_priv *adapter,struct wb35_descriptor *pDes); - -void -MLME_SendComplete (struct wbsoft_priv *adapter,u8 PacketID, -unsigned char SendOK); - -#endif
drivers/staging/winbond/wbusb.c +0 -1
@@ -14,7 +14,6 @@#include "core.h" #include "mds_f.h" -#include "mlmetxrx_f.h" #include "mto.h" #include "wbhal.h" #include "wb35reg_f.h"
Signature · 1 line
1.7.0.4
PATCH 11/13 w35und: Kill wblinux_f.h header
In reply to Pekka EnbergThe wblinux_f.h header file doesn't contain anything that's actually used. Kill it.
--- drivers/staging/winbond/mds.c | 1 - drivers/staging/winbond/wblinux_f.h | 17 ----------------- drivers/staging/winbond/wbusb.c | 1 - 3 files changed, 0 insertions(+), 19 deletions(-) delete mode 100644 drivers/staging/winbond/wblinux_f.h
drivers/staging/winbond/mds.c +0 -1
@@ -1,7 +1,6 @@#include "mds_f.h" #include "mto.h" #include "wbhal.h" -#include "wblinux_f.h" #include "wb35tx_f.h" unsigned char
drivers/staging/winbond/wblinux_f.h deleted +0 -17
@@ -1,17 +0,0 @@ -#ifndef __WBLINUX_F_H -#define __WBLINUX_F_H - -#include "core.h" -#include "mds_s.h" - -/* -* ==================================================================== -* Copyright (c) 1996-2004 Winbond Electronic Corporation -* -* wblinux_f.h -* ==================================================================== -*/ -int wb35_start_xmit (struct sk_buff *skb,struct net_device *netdev); -void wb35_set_multicast (struct net_device *netdev); -struct net_device_stats *wb35_netdev_stats (struct net_device *netdev); -#endif
drivers/staging/winbond/wbusb.c +0 -1
@@ -19,7 +19,6 @@#include "wb35reg_f.h" #include "wb35tx_f.h" #include "wb35rx_f.h" -#include "wblinux_f.h" MODULE_DESCRIPTION ("IS89C35 802.11bg WLAN USB Driver" );MODULE_LICENSE ("GPL" );
Signature · 1 line
1.7.0.4
PATCH 12/13 w35und: Remove unused fields from struct wb_usb
In reply to Pekka EnbergThis patch removes two unused fields from struct wb_usb:
- DetectCount which is always zero
- IsUsb20 which is a write-only struct member
--- drivers/staging/winbond/wb35reg_s.h | 1 - drivers/staging/winbond/wbusb.c | 8 ++------ drivers/staging/winbond/wbusb_s.h | 2 -- 3 files changed, 2 insertions(+), 9 deletions(-)
drivers/staging/winbond/wb35reg_s.h +0 -1
@@ -234,7 +234,6 @@ u32 hal_get_bss_pk_cnt(struct hw_data *hw_data);/* return 100ms count */ #define hal_get_time_count (_P) (_P->time_count / 10) -#define hal_detect_error (_P) (_P->WbUsb.DetectCount)#define hal_ibss_disconnect (_A) (hal_stop_sync_bss(_A))
drivers/staging/winbond/wbusb.c +2 -6
@@ -337,10 +337,8 @@ static void hal_stop(struct hw_data *pHwData)static unsigned char hal_idle (struct hw_data *pHwData) {struct wb35_reg *reg = &pHwData->reg; -struct wb_usb *pWbUsb = &pHwData->WbUsb; -if (!pHwData->SurpriseRemove - && (pWbUsb->DetectCount || reg->EP0vm_state !=VM_STOP )) +if (!pHwData->SurpriseRemove && reg->EP0vm_state !=VM_STOP )return false;return true;
@@ -786,10 +784,8 @@ static int wb35_probe(struct usb_interface *intf, interface = intf->cur_altsetting; endpoint = &interface->endpoint[0 ].desc; -if (endpoint[2 ].wMaxPacketSize ==512 ) { +if (endpoint[2 ].wMaxPacketSize ==512 )printk ("[w35und] Working on USB 2.0\n" ); - pWbUsb->IsUsb20 =1 ; - } err =wb35_hw_init (dev);if (err)
drivers/staging/winbond/wbusb_s.h +0 -2
@@ -11,8 +11,6 @@#include <linux/types.h> struct wb_usb { -u32 IsUsb20;struct usb_device *udev; -u32 DetectCount; };#endif
Signature · 1 line
1.7.0.4
PATCH 13/13 w35und: Kill struct wb_usb
In reply to Pekka EnbergThis patch kills struct wb_usb which now only contains a pointer to struct usb_device.
--- drivers/staging/winbond/wb35reg.c | 12 ++++++------ drivers/staging/winbond/wb35rx.c | 4 ++-- drivers/staging/winbond/wb35tx.c | 6 +++--- drivers/staging/winbond/wbhal.h | 3 +-- drivers/staging/winbond/wbusb.c | 4 +--- drivers/staging/winbond/wbusb_s.h | 16 ---------------- 6 files changed, 13 insertions(+), 32 deletions(-) delete mode 100644 drivers/staging/winbond/wbusb_s.h
drivers/staging/winbond/wb35reg.c +6 -6
@@ -139,8 +139,8 @@ unsigned char Wb35Reg_WriteSync(struct hw_data *pHwData, u16 RegisterNo, u32 Reg/* Sync IoCallDriver */ reg->EP0vm_state =VM_RUNNING ; - ret =usb_control_msg (pHwData->WbUsb.udev, -usb_sndctrlpipe (pHwData->WbUsb.udev,0 ), + ret =usb_control_msg (pHwData->udev, +usb_sndctrlpipe (pHwData->udev,0 ),0x03 ,USB_TYPE_VENDOR |USB_RECIP_DEVICE |USB_DIR_OUT ,0x0 , RegisterNo, &RegisterValue,4 ,HZ *100 ); reg->EP0vm_state =VM_STOP ;
@@ -302,8 +302,8 @@ unsigned char Wb35Reg_ReadSync(struct hw_data *pHwData, u16 RegisterNo, u32 *pRemsleep (10 ); reg->EP0vm_state =VM_RUNNING ; - ret =usb_control_msg (pHwData->WbUsb.udev, -usb_rcvctrlpipe (pHwData->WbUsb.udev,0 ), + ret =usb_control_msg (pHwData->udev, +usb_rcvctrlpipe (pHwData->udev,0 ),0x01 ,USB_TYPE_VENDOR |USB_RECIP_DEVICE |USB_DIR_IN ,0x0 , RegisterNo, pltmp,4 ,HZ *100 );
@@ -427,8 +427,8 @@ void Wb35Reg_EP0VM(struct hw_data *pHwData)if (reg_queue->DIRECT ==1 )/* output */ pBuffer = ®_queue->VALUE; -usb_fill_control_urb (urb, pHwData->WbUsb.udev, -REG_DIRECTION (pHwData->WbUsb.udev, reg_queue), +usb_fill_control_urb (urb, pHwData->udev, +REG_DIRECTION (pHwData->udev, reg_queue), (u8 *)dr, pBuffer,cpu_to_le16 (dr->wLength), Wb35Reg_EP0VM_complete, (void *)pHwData);
drivers/staging/winbond/wb35rx.c +2 -2
@@ -260,8 +260,8 @@ static void Wb35Rx(struct ieee80211_hw *hw) } pRxBufferAddress = pWb35Rx->pDRx; -usb_fill_bulk_urb (urb, pHwData->WbUsb.udev, -usb_rcvbulkpipe (pHwData->WbUsb.udev,3 ), +usb_fill_bulk_urb (urb, pHwData->udev, +usb_rcvbulkpipe (pHwData->udev,3 ), pRxBufferAddress,MAX_USB_RX_BUFFER , Wb35Rx_Complete, hw);
drivers/staging/winbond/wb35tx.c +3 -3
@@ -88,8 +88,8 @@ static void Wb35Tx(struct wbsoft_priv *adapter)// // Issuing URB // -usb_fill_bulk_urb (pUrb, pHwData->WbUsb.udev, -usb_sndbulkpipe (pHwData->WbUsb.udev,4 ), +usb_fill_bulk_urb (pUrb, pHwData->udev, +usb_sndbulkpipe (pHwData->udev,4 ), pTxBufferAddress, pMds->TxBufferSize[ SendIndex ], Wb35Tx_complete, adapter);
@@ -265,7 +265,7 @@ static void Wb35Tx_EP2VM(struct wbsoft_priv *adapter)// // Issuing URB // -usb_fill_int_urb ( pUrb, pHwData->WbUsb.udev,usb_rcvintpipe (pHwData->WbUsb.udev,2 ), +usb_fill_int_urb ( pUrb, pHwData->udev,usb_rcvintpipe (pHwData->udev,2 ), pltmp,MAX_INTERRUPT_LENGTH , Wb35Tx_EP2VM_complete, adapter,32 ); pWb35Tx->EP2vm_state =VM_RUNNING ;
drivers/staging/winbond/wbhal.h +1 -2
@@ -356,7 +356,6 @@ struct txvga_for_50 {* ============================================== */ -#include "wbusb_s.h" #include "wb35reg_s.h" #include "wb35tx_s.h" #include "wb35rx_s.h"
@@ -437,7 +436,7 @@ struct hw_data {* Variable for each module * ================================================== */ -struct wb_usb WbUsb;/* Need WbUsb.h */ +struct usb_device *udev;struct wb35_reg reg;/* Need Wb35Reg.h */ struct wb35_tx Wb35Tx;/* Need Wb35Tx.h */ struct wb35_rx Wb35Rx;/* Need Wb35Rx.h */
drivers/staging/winbond/wbusb.c +1 -3
@@ -747,7 +747,6 @@ static int wb35_probe(struct usb_interface *intf,struct usb_host_interface *interface;struct ieee80211_hw *dev;struct wbsoft_priv *priv; -struct wb_usb *pWbUsb;int nr, err;u32 ltmp;
@@ -778,8 +777,7 @@ static int wb35_probe(struct usb_interface *intf, priv = dev->priv; - pWbUsb = &priv->sHwData.WbUsb; - pWbUsb->udev = udev; + priv->sHwData.udev = udev; interface = intf->cur_altsetting; endpoint = &interface->endpoint[0 ].desc;
drivers/staging/winbond/wbusb_s.h deleted +0 -16
@@ -1,16 +0,0 @@ -/* ========================================================= -* Copyright (c) 1996-2004 Winbond Electronic Corporation -* -* Module Name: -* wbusb_s.h -* ========================================================= -*/ -#ifndef __WINBOND_WBUSB_S_H -#define __WINBOND_WBUSB_S_H - -#include <linux/types.h> - -struct wb_usb { -struct usb_device *udev; -}; -#endif
Signature · 1 line
1.7.0.4