redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

Staging: wlan-ng: Replace BITx with the generic BIT(x)

Browse source 
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Moritz Muehlenhoff 2009-01-25 21:54:55 +01:00 committed by Greg Kroah-Hartman
parent ae26230bf9
commit 7f6e0e449c
10 changed files with 133 additions and 167 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

166
drivers/staging/wlan-ng/hfa384x.h
View file

@ -97,17 +97,17 @@
#define HFA384x_PORTTYPE_WDS ((u16)2) #define HFA384x_PORTTYPE_WDS ((u16)2)
#define HFA384x_PORTTYPE_PSUEDOIBSS ((u16)3) #define HFA384x_PORTTYPE_PSUEDOIBSS ((u16)3)
#define HFA384x_PORTTYPE_HOSTAP ((u16)6) #define HFA384x_PORTTYPE_HOSTAP ((u16)6)
#define HFA384x_WEPFLAGS_PRIVINVOKED ((u16)BIT0) #define HFA384x_WEPFLAGS_PRIVINVOKED ((u16)BIT(0))
#define HFA384x_WEPFLAGS_EXCLUDE ((u16)BIT1) #define HFA384x_WEPFLAGS_EXCLUDE ((u16)BIT(1))
#define HFA384x_WEPFLAGS_DISABLE_TXCRYPT ((u16)BIT4) #define HFA384x_WEPFLAGS_DISABLE_TXCRYPT ((u16)BIT(4))
#define HFA384x_WEPFLAGS_DISABLE_RXCRYPT ((u16)BIT7) #define HFA384x_WEPFLAGS_DISABLE_RXCRYPT ((u16)BIT(7))
#define HFA384x_WEPFLAGS_DISALLOW_MIXED ((u16)BIT11) #define HFA384x_WEPFLAGS_DISALLOW_MIXED ((u16)BIT(11))
#define HFA384x_WEPFLAGS_IV_intERVAL1 ((u16)0) #define HFA384x_WEPFLAGS_IV_intERVAL1 ((u16)0)
#define HFA384x_WEPFLAGS_IV_intERVAL10 ((u16)BIT5) #define HFA384x_WEPFLAGS_IV_intERVAL10 ((u16)BIT(5))
#define HFA384x_WEPFLAGS_IV_intERVAL50 ((u16)BIT6) #define HFA384x_WEPFLAGS_IV_intERVAL50 ((u16)BIT(6))
#define HFA384x_WEPFLAGS_IV_intERVAL100 ((u16)(BIT5 | BIT6)) #define HFA384x_WEPFLAGS_IV_intERVAL100 ((u16)(BIT(5) | BIT(6)))
#define HFA384x_WEPFLAGS_FIRMWARE_WPA ((u16)BIT8) #define HFA384x_WEPFLAGS_FIRMWARE_WPA ((u16)BIT(8))
#define HFA384x_WEPFLAGS_HOST_MIC ((u16)BIT9) #define HFA384x_WEPFLAGS_HOST_MIC ((u16)BIT(9))
#define HFA384x_ROAMMODE_FWSCAN_FWROAM ((u16)1) #define HFA384x_ROAMMODE_FWSCAN_FWROAM ((u16)1)
#define HFA384x_ROAMMODE_FWSCAN_HOSTROAM ((u16)2) #define HFA384x_ROAMMODE_FWSCAN_HOSTROAM ((u16)2)
#define HFA384x_ROAMMODE_HOSTSCAN_HOSTROAM ((u16)3) #define HFA384x_ROAMMODE_HOSTSCAN_HOSTROAM ((u16)3)
@ -248,59 +248,59 @@
#define HFA384x_PCI_M1_CTL_OFF (0xac) #define HFA384x_PCI_M1_CTL_OFF (0xac)
/*--- Register Field Masks --------------------------*/ /*--- Register Field Masks --------------------------*/
#define HFA384x_CMD_BUSY ((u16)BIT15) #define HFA384x_CMD_BUSY ((u16)BIT(15))
#define HFA384x_CMD_AINFO ((u16)(BIT14 | BIT13 | BIT12 | BIT11 | BIT10 | BIT9 | BIT8)) #define HFA384x_CMD_AINFO ((u16)(BIT(14) | BIT(13) | BIT(12) | BIT(11) | BIT(10) | BIT(9) | BIT(8)))
#define HFA384x_CMD_MACPORT ((u16)(BIT10 | BIT9 | BIT8)) #define HFA384x_CMD_MACPORT ((u16)(BIT(10) | BIT(9) | BIT(8)))
#define HFA384x_CMD_RECL ((u16)BIT8) #define HFA384x_CMD_RECL ((u16)BIT(8))
#define HFA384x_CMD_WRITE ((u16)BIT8) #define HFA384x_CMD_WRITE ((u16)BIT(8))
#define HFA384x_CMD_PROGMODE ((u16)(BIT9 | BIT8)) #define HFA384x_CMD_PROGMODE ((u16)(BIT(9) | BIT(8)))
#define HFA384x_CMD_CMDCODE ((u16)(BIT5 | BIT4 | BIT3 | BIT2 | BIT1 | BIT0)) #define HFA384x_CMD_CMDCODE ((u16)(BIT(5) | BIT(4) | BIT(3) | BIT(2) | BIT(1) | BIT(0)))
#define HFA384x_STATUS_RESULT ((u16)(BIT14 | BIT13 | BIT12 | BIT11 | BIT10 | BIT9 | BIT8)) #define HFA384x_STATUS_RESULT ((u16)(BIT(14) | BIT(13) | BIT(12) | BIT(11) | BIT(10) | BIT(9) | BIT(8)))
#define HFA384x_STATUS_CMDCODE ((u16)(BIT5 | BIT4 | BIT3 | BIT2 | BIT1 | BIT0)) #define HFA384x_STATUS_CMDCODE ((u16)(BIT(5) | BIT(4) | BIT(3) | BIT(2) | BIT(1) | BIT(0)))
#define HFA384x_OFFSET_BUSY ((u16)BIT15) #define HFA384x_OFFSET_BUSY ((u16)BIT(15))
#define HFA384x_OFFSET_ERR ((u16)BIT14) #define HFA384x_OFFSET_ERR ((u16)BIT(14))
#define HFA384x_OFFSET_DATAOFF ((u16)(BIT11 | BIT10 | BIT9 | BIT8 | BIT7 | BIT6 | BIT5 | BIT4 | BIT3 | BIT2 | BIT1)) #define HFA384x_OFFSET_DATAOFF ((u16)(BIT(11) | BIT(10) | BIT(9) | BIT(8) | BIT(7) | BIT(6) | BIT(5) | BIT(4) | BIT(3) | BIT(2) | BIT(1)))
#define HFA384x_EVSTAT_TICK ((u16)BIT15) #define HFA384x_EVSTAT_TICK ((u16)BIT(15))
#define HFA384x_EVSTAT_WTERR ((u16)BIT14) #define HFA384x_EVSTAT_WTERR ((u16)BIT(14))
#define HFA384x_EVSTAT_INFDROP ((u16)BIT13) #define HFA384x_EVSTAT_INFDROP ((u16)BIT(13))
#define HFA384x_EVSTAT_INFO ((u16)BIT7) #define HFA384x_EVSTAT_INFO ((u16)BIT(7))
#define HFA384x_EVSTAT_DTIM ((u16)BIT5) #define HFA384x_EVSTAT_DTIM ((u16)BIT(5))
#define HFA384x_EVSTAT_CMD ((u16)BIT4) #define HFA384x_EVSTAT_CMD ((u16)BIT(4))
#define HFA384x_EVSTAT_ALLOC ((u16)BIT3) #define HFA384x_EVSTAT_ALLOC ((u16)BIT(3))
#define HFA384x_EVSTAT_TXEXC ((u16)BIT2) #define HFA384x_EVSTAT_TXEXC ((u16)BIT(2))
#define HFA384x_EVSTAT_TX ((u16)BIT1) #define HFA384x_EVSTAT_TX ((u16)BIT(1))
#define HFA384x_EVSTAT_RX ((u16)BIT0) #define HFA384x_EVSTAT_RX ((u16)BIT(0)
#define HFA384x_int_BAP_OP (HFA384x_EVSTAT_INFO|HFA384x_EVSTAT_RX|HFA384x_EVSTAT_TX|HFA384x_EVSTAT_TXEXC) #define HFA384x_int_BAP_OP (HFA384x_EVSTAT_INFO|HFA384x_EVSTAT_RX|HFA384x_EVSTAT_TX|HFA384x_EVSTAT_TXEXC)
#define HFA384x_int_NORMAL (HFA384x_EVSTAT_INFO|HFA384x_EVSTAT_RX|HFA384x_EVSTAT_TX|HFA384x_EVSTAT_TXEXC|HFA384x_EVSTAT_INFDROP|HFA384x_EVSTAT_ALLOC|HFA384x_EVSTAT_DTIM) #define HFA384x_int_NORMAL (HFA384x_EVSTAT_INFO|HFA384x_EVSTAT_RX|HFA384x_EVSTAT_TX|HFA384x_EVSTAT_TXEXC|HFA384x_EVSTAT_INFDROP|HFA384x_EVSTAT_ALLOC|HFA384x_EVSTAT_DTIM)
#define HFA384x_intEN_TICK ((u16)BIT15) #define HFA384x_intEN_TICK ((u16)BIT(15))
#define HFA384x_intEN_WTERR ((u16)BIT14) #define HFA384x_intEN_WTERR ((u16)BIT(14))
#define HFA384x_intEN_INFDROP ((u16)BIT13) #define HFA384x_intEN_INFDROP ((u16)BIT(13))
#define HFA384x_intEN_INFO ((u16)BIT7) #define HFA384x_intEN_INFO ((u16)BIT(7))
#define HFA384x_intEN_DTIM ((u16)BIT5) #define HFA384x_intEN_DTIM ((u16)BIT(5))
#define HFA384x_intEN_CMD ((u16)BIT4) #define HFA384x_intEN_CMD ((u16)BIT(4))
#define HFA384x_intEN_ALLOC ((u16)BIT3) #define HFA384x_intEN_ALLOC ((u16)BIT(3))
#define HFA384x_intEN_TXEXC ((u16)BIT2) #define HFA384x_intEN_TXEXC ((u16)BIT(2))
#define HFA384x_intEN_TX ((u16)BIT1) #define HFA384x_intEN_TX ((u16)BIT(1))
#define HFA384x_intEN_RX ((u16)BIT0) #define HFA384x_intEN_RX ((u16)BIT(0)
#define HFA384x_EVACK_TICK ((u16)BIT15) #define HFA384x_EVACK_TICK ((u16)BIT(15))
#define HFA384x_EVACK_WTERR ((u16)BIT14) #define HFA384x_EVACK_WTERR ((u16)BIT(14))
#define HFA384x_EVACK_INFDROP ((u16)BIT13) #define HFA384x_EVACK_INFDROP ((u16)BIT(13))
#define HFA384x_EVACK_INFO ((u16)BIT7) #define HFA384x_EVACK_INFO ((u16)BIT(7))
#define HFA384x_EVACK_DTIM ((u16)BIT5) #define HFA384x_EVACK_DTIM ((u16)BIT(5))
#define HFA384x_EVACK_CMD ((u16)BIT4) #define HFA384x_EVACK_CMD ((u16)BIT(4))
#define HFA384x_EVACK_ALLOC ((u16)BIT3) #define HFA384x_EVACK_ALLOC ((u16)BIT(3))
#define HFA384x_EVACK_TXEXC ((u16)BIT2) #define HFA384x_EVACK_TXEXC ((u16)BIT(2))
#define HFA384x_EVACK_TX ((u16)BIT1) #define HFA384x_EVACK_TX ((u16)BIT(1))
#define HFA384x_EVACK_RX ((u16)BIT0) #define HFA384x_EVACK_RX ((u16)BIT(0)
#define HFA384x_CONTROL_AUXEN ((u16)(BIT15 | BIT14)) #define HFA384x_CONTROL_AUXEN ((u16)(BIT(15) | BIT(14)))
/*--- Command Code Constants --------------------------*/ /*--- Command Code Constants --------------------------*/
@ -883,11 +883,11 @@ PD Record codes
/*=============================================================*/ /*=============================================================*/
/*------ Types and their related constants --------------------*/ /*------ Types and their related constants --------------------*/
#define HFA384x_HOSTAUTHASSOC_HOSTAUTH BIT0 #define HFA384x_HOSTAUTHASSOC_HOSTAUTH BIT(0)
#define HFA384x_HOSTAUTHASSOC_HOSTASSOC BIT1 #define HFA384x_HOSTAUTHASSOC_HOSTASSOC BIT(1)
#define HFA384x_WHAHANDLING_DISABLED 0 #define HFA384x_WHAHANDLING_DISABLED 0
#define HFA384x_WHAHANDLING_PASSTHROUGH BIT1 #define HFA384x_WHAHANDLING_PASSTHROUGH BIT(1)
/*-------------------------------------------------------------*/ /*-------------------------------------------------------------*/
/* Commonly used basic types */ /* Commonly used basic types */
@ -1518,11 +1518,11 @@ typedef struct hfa384x_LFOStatus
u16 VRHFOResult; u16 VRHFOResult;
} __attribute__((packed)) hfa384x_LFOStatus_t; } __attribute__((packed)) hfa384x_LFOStatus_t;
#define HFA384x_TESTRESULT_ALLPASSED BIT0 #define HFA384x_TESTRESULT_ALLPASSED BIT(0)
#define HFA384x_TESTRESULT_LFO_FAIL BIT1 #define HFA384x_TESTRESULT_LFO_FAIL BIT(1)
#define HFA384x_TESTRESULT_VR_HF0_FAIL BIT2 #define HFA384x_TESTRESULT_VR_HF0_FAIL BIT(2)
#define HFA384x_HOST_FIRM_COORDINATE BIT7 #define HFA384x_HOST_FIRM_COORDINATE BIT(7)
#define HFA384x_TESTRESULT_COORDINATE BIT15 #define HFA384x_TESTRESULT_COORDINATE BIT(15)
/*-- Information Record: LEDControl --*/ /*-- Information Record: LEDControl --*/
typedef struct hfa384x_LEDControl typedef struct hfa384x_LEDControl
@ -1606,20 +1606,20 @@ typedef struct hfa384x_tx_frame
Communication Frames: Field Masks for Transmit Frames Communication Frames: Field Masks for Transmit Frames
--------------------------------------------------------------------*/ --------------------------------------------------------------------*/
/*-- Status Field --*/ /*-- Status Field --*/
#define HFA384x_TXSTATUS_ACKERR ((u16)BIT5) #define HFA384x_TXSTATUS_ACKERR ((u16)BIT(5))
#define HFA384x_TXSTATUS_FORMERR ((u16)BIT3) #define HFA384x_TXSTATUS_FORMERR ((u16)BIT(3))
#define HFA384x_TXSTATUS_DISCON ((u16)BIT2) #define HFA384x_TXSTATUS_DISCON ((u16)BIT(2))
#define HFA384x_TXSTATUS_AGEDERR ((u16)BIT1) #define HFA384x_TXSTATUS_AGEDERR ((u16)BIT(1))
#define HFA384x_TXSTATUS_RETRYERR ((u16)BIT0) #define HFA384x_TXSTATUS_RETRYERR ((u16)BIT(0))
/*-- Transmit Control Field --*/ /*-- Transmit Control Field --*/
#define HFA384x_TX_CFPOLL ((u16)BIT12) #define HFA384x_TX_CFPOLL ((u16)BIT(12))
#define HFA384x_TX_PRST ((u16)BIT11) #define HFA384x_TX_PRST ((u16)BIT(11))
#define HFA384x_TX_MACPORT ((u16)(BIT10 | BIT9 | BIT8)) #define HFA384x_TX_MACPORT ((u16)(BIT(10) | BIT(9) | BIT(8)))
#define HFA384x_TX_NOENCRYPT ((u16)BIT7) #define HFA384x_TX_NOENCRYPT ((u16)BIT(7))
#define HFA384x_TX_RETRYSTRAT ((u16)(BIT6 | BIT5)) #define HFA384x_TX_RETRYSTRAT ((u16)(BIT(6) | BIT(5)))
#define HFA384x_TX_STRUCTYPE ((u16)(BIT4 | BIT3)) #define HFA384x_TX_STRUCTYPE ((u16)(BIT(4) | BIT(3)))
#define HFA384x_TX_TXEX ((u16)BIT2) #define HFA384x_TX_TXEX ((u16)BIT(2))
#define HFA384x_TX_TXOK ((u16)BIT1) #define HFA384x_TX_TXOK ((u16)BIT(1))
/*-------------------------------------------------------------------- /*--------------------------------------------------------------------
Communication Frames: Test/Get/Set Field Values for Transmit Frames Communication Frames: Test/Get/Set Field Values for Transmit Frames
--------------------------------------------------------------------*/ --------------------------------------------------------------------*/
@ -1695,10 +1695,10 @@ Communication Frames: Field Masks for Receive Frames
#define HFA384x_RX_DATA_OFF ((u16)60) #define HFA384x_RX_DATA_OFF ((u16)60)
/*-- Status Fields --*/ /*-- Status Fields --*/
#define HFA384x_RXSTATUS_MSGTYPE ((u16)(BIT15 | BIT14 | BIT13)) #define HFA384x_RXSTATUS_MSGTYPE ((u16)(BIT(15) | BIT(14) | BIT(13)))
#define HFA384x_RXSTATUS_MACPORT ((u16)(BIT10 | BIT9 | BIT8)) #define HFA384x_RXSTATUS_MACPORT ((u16)(BIT(10) | BIT(9) | BIT(8)))
#define HFA384x_RXSTATUS_UNDECR ((u16)BIT1) #define HFA384x_RXSTATUS_UNDECR ((u16)BIT(1))
#define HFA384x_RXSTATUS_FCSERR ((u16)BIT0) #define HFA384x_RXSTATUS_FCSERR ((u16)BIT(0))
/*-------------------------------------------------------------------- /*--------------------------------------------------------------------
Communication Frames: Test/Get/Set Field Values for Receive Frames Communication Frames: Test/Get/Set Field Values for Receive Frames
--------------------------------------------------------------------*/ --------------------------------------------------------------------*/
@ -1822,8 +1822,8 @@ typedef struct hfa384x_ChInfoResultSub
u16 active; u16 active;
} __attribute__((packed)) hfa384x_ChInfoResultSub_t; } __attribute__((packed)) hfa384x_ChInfoResultSub_t;
#define HFA384x_CHINFORESULT_BSSACTIVE BIT0 #define HFA384x_CHINFORESULT_BSSACTIVE BIT(0)
#define HFA384x_CHINFORESULT_PCFACTIVE BIT1 #define HFA384x_CHINFORESULT_PCFACTIVE BIT(1)
typedef struct hfa384x_ChInfoResult typedef struct hfa384x_ChInfoResult
{ {
@ -2444,9 +2444,9 @@ typedef struct hfa484x_metacmd
#define MAX_GRP_ADDR 32 #define MAX_GRP_ADDR 32
#define WLAN_COMMENT_MAX 80 /* Max. length of user comment string. */ #define WLAN_COMMENT_MAX 80 /* Max. length of user comment string. */
#define MM_SAT_PCF (BIT14) #define MM_SAT_PCF (BIT(14))
#define MM_GCSD_PCF (BIT15) #define MM_GCSD_PCF (BIT(15))
#define MM_GCSD_PCF_EB (BIT14 | BIT15) #define MM_GCSD_PCF_EB (BIT(14) | BIT(15))
#define WLAN_STATE_STOPPED 0 /* Network is not active. */ #define WLAN_STATE_STOPPED 0 /* Network is not active. */
#define WLAN_STATE_STARTED 1 /* Network has been started. */ #define WLAN_STATE_STARTED 1 /* Network has been started. */

28
drivers/staging/wlan-ng/p80211hdr.h
View file

@ -167,17 +167,17 @@
/* SET_FC_FSTYPE(WLAN_FSTYPE_RTS) ); */ /* SET_FC_FSTYPE(WLAN_FSTYPE_RTS) ); */
/*------------------------------------------------------------*/ /*------------------------------------------------------------*/
#define WLAN_GET_FC_PVER(n) (((u16)(n)) & (BIT0 | BIT1)) #define WLAN_GET_FC_PVER(n) (((u16)(n)) & (BIT(0) | BIT(1)))
#define WLAN_GET_FC_FTYPE(n) ((((u16)(n)) & (BIT2 | BIT3)) >> 2) #define WLAN_GET_FC_FTYPE(n) ((((u16)(n)) & (BIT(2) | BIT(3))) >> 2)
#define WLAN_GET_FC_FSTYPE(n) ((((u16)(n)) & (BIT4|BIT5|BIT6|BIT7)) >> 4) #define WLAN_GET_FC_FSTYPE(n) ((((u16)(n)) & (BIT(4)|BIT(5)|BIT(6)|BIT(7))) >> 4)
#define WLAN_GET_FC_TODS(n) ((((u16)(n)) & (BIT8)) >> 8) #define WLAN_GET_FC_TODS(n) ((((u16)(n)) & (BIT(8))) >> 8)
#define WLAN_GET_FC_FROMDS(n) ((((u16)(n)) & (BIT9)) >> 9) #define WLAN_GET_FC_FROMDS(n) ((((u16)(n)) & (BIT(9))) >> 9)
#define WLAN_GET_FC_MOREFRAG(n) ((((u16)(n)) & (BIT10)) >> 10) #define WLAN_GET_FC_MOREFRAG(n) ((((u16)(n)) & (BIT(10))) >> 10)
#define WLAN_GET_FC_RETRY(n) ((((u16)(n)) & (BIT11)) >> 11) #define WLAN_GET_FC_RETRY(n) ((((u16)(n)) & (BIT(11))) >> 11)
#define WLAN_GET_FC_PWRMGT(n) ((((u16)(n)) & (BIT12)) >> 12) #define WLAN_GET_FC_PWRMGT(n) ((((u16)(n)) & (BIT(12))) >> 12)
#define WLAN_GET_FC_MOREDATA(n) ((((u16)(n)) & (BIT13)) >> 13) #define WLAN_GET_FC_MOREDATA(n) ((((u16)(n)) & (BIT(13))) >> 13)
#define WLAN_GET_FC_ISWEP(n) ((((u16)(n)) & (BIT14)) >> 14) #define WLAN_GET_FC_ISWEP(n) ((((u16)(n)) & (BIT(14))) >> 14)
#define WLAN_GET_FC_ORDER(n) ((((u16)(n)) & (BIT15)) >> 15) #define WLAN_GET_FC_ORDER(n) ((((u16)(n)) & (BIT(15))) >> 15)
#define WLAN_SET_FC_PVER(n) ((u16)(n)) #define WLAN_SET_FC_PVER(n) ((u16)(n))
#define WLAN_SET_FC_FTYPE(n) (((u16)(n)) << 2) #define WLAN_SET_FC_FTYPE(n) (((u16)(n)) << 2)
@ -202,8 +202,8 @@
/* Macros to get/set the bitfields of the Sequence Control */ /* Macros to get/set the bitfields of the Sequence Control */
/* Field. */ /* Field. */
/*------------------------------------------------------------*/ /*------------------------------------------------------------*/
#define WLAN_GET_SEQ_FRGNUM(n) (((u16)(n)) & (BIT0|BIT1|BIT2|BIT3)) #define WLAN_GET_SEQ_FRGNUM(n) (((u16)(n)) & (BIT(0)|BIT(1)|BIT(2)|BIT(3)))
#define WLAN_GET_SEQ_SEQNUM(n) ((((u16)(n)) & (~(BIT0|BIT1|BIT2|BIT3))) >> 4) #define WLAN_GET_SEQ_SEQNUM(n) ((((u16)(n)) & (~(BIT(0)|BIT(1)|BIT(2)|BIT(3)))) >> 4)
/*--- Data ptr macro -----------------------------------------*/ /*--- Data ptr macro -----------------------------------------*/
/* Creates a u8* to the data portion of a frame */ /* Creates a u8* to the data portion of a frame */
@ -212,7 +212,7 @@
#define WLAN_HDR_A3_DATAP(p) (((u8*)(p)) + WLAN_HDR_A3_LEN) #define WLAN_HDR_A3_DATAP(p) (((u8*)(p)) + WLAN_HDR_A3_LEN)
#define WLAN_HDR_A4_DATAP(p) (((u8*)(p)) + WLAN_HDR_A4_LEN) #define WLAN_HDR_A4_DATAP(p) (((u8*)(p)) + WLAN_HDR_A4_LEN)
#define DOT11_RATE5_ISBASIC_GET(r) (((u8)(r)) & BIT7) #define DOT11_RATE5_ISBASIC_GET(r) (((u8)(r)) & BIT(7))
/*================================================================*/ /*================================================================*/
/* Types */ /* Types */

6
drivers/staging/wlan-ng/p80211ioctl.h
View file

@ -86,9 +86,9 @@
/*----------------------------------------------------------------*/ /*----------------------------------------------------------------*/
/* Netlink multicast bits for different types of messages */ /* Netlink multicast bits for different types of messages */
#define P80211_NL_MCAST_GRP_MLME BIT0 /* Local station messages */ #define P80211_NL_MCAST_GRP_MLME BIT(0) /* Local station messages */
#define P80211_NL_MCAST_GRP_SNIFF BIT1 /* Sniffer messages */ #define P80211_NL_MCAST_GRP_SNIFF BIT(1) /* Sniffer messages */
#define P80211_NL_MCAST_GRP_DIST BIT2 /* Distribution system messages */ #define P80211_NL_MCAST_GRP_DIST BIT(2) /* Distribution system messages */
/*================================================================*/ /*================================================================*/
/* Types */ /* Types */

16
drivers/staging/wlan-ng/p80211mgmt.h
View file

@ -213,15 +213,15 @@
/* Macros */ /* Macros */
/*-- Capability Field ---------------------------*/ /*-- Capability Field ---------------------------*/
#define WLAN_GET_MGMT_CAP_INFO_ESS(n) ((n) & BIT0) #define WLAN_GET_MGMT_CAP_INFO_ESS(n) ((n) & BIT(0))
#define WLAN_GET_MGMT_CAP_INFO_IBSS(n) (((n) & BIT1) >> 1) #define WLAN_GET_MGMT_CAP_INFO_IBSS(n) (((n) & BIT(1)) >> 1)
#define WLAN_GET_MGMT_CAP_INFO_CFPOLLABLE(n) (((n) & BIT2) >> 2) #define WLAN_GET_MGMT_CAP_INFO_CFPOLLABLE(n) (((n) & BIT(2)) >> 2)
#define WLAN_GET_MGMT_CAP_INFO_CFPOLLREQ(n) (((n) & BIT3) >> 3) #define WLAN_GET_MGMT_CAP_INFO_CFPOLLREQ(n) (((n) & BIT(3)) >> 3)
#define WLAN_GET_MGMT_CAP_INFO_PRIVACY(n) (((n) & BIT4) >> 4) #define WLAN_GET_MGMT_CAP_INFO_PRIVACY(n) (((n) & BIT(4)) >> 4)
/* p80211b additions */ /* p80211b additions */
#define WLAN_GET_MGMT_CAP_INFO_SHORT(n) (((n) & BIT5) >> 5) #define WLAN_GET_MGMT_CAP_INFO_SHORT(n) (((n) & BIT(5)) >> 5)
#define WLAN_GET_MGMT_CAP_INFO_PBCC(n) (((n) & BIT6) >> 6) #define WLAN_GET_MGMT_CAP_INFO_PBCC(n) (((n) & BIT(6)) >> 6)
#define WLAN_GET_MGMT_CAP_INFO_AGILITY(n) (((n) & BIT7) >> 7) #define WLAN_GET_MGMT_CAP_INFO_AGILITY(n) (((n) & BIT(7)) >> 7)
#define WLAN_SET_MGMT_CAP_INFO_ESS(n) (n) #define WLAN_SET_MGMT_CAP_INFO_ESS(n) (n)
#define WLAN_SET_MGMT_CAP_INFO_IBSS(n) ((n) << 1) #define WLAN_SET_MGMT_CAP_INFO_IBSS(n) ((n) << 1)

10
drivers/staging/wlan-ng/p80211netdev.h
View file

@ -158,11 +158,11 @@ int p80211wext_event_associated(struct wlandevice *wlandev, int assoc);
#define NUM_WEPKEYS 4 #define NUM_WEPKEYS 4
#define MAX_KEYLEN 32 #define MAX_KEYLEN 32
#define HOSTWEP_DEFAULTKEY_MASK (BIT1|BIT0) #define HOSTWEP_DEFAULTKEY_MASK (BIT(1)|BIT(0))
#define HOSTWEP_DECRYPT BIT4 #define HOSTWEP_DECRYPT BIT(4)
#define HOSTWEP_ENCRYPT BIT5 #define HOSTWEP_ENCRYPT BIT(5)
#define HOSTWEP_PRIVACYINVOKED BIT6 #define HOSTWEP_PRIVACYINVOKED BIT(6)
#define HOSTWEP_EXCLUDEUNENCRYPTED BIT7 #define HOSTWEP_EXCLUDEUNENCRYPTED BIT(7)
extern int wlan_watchdog; extern int wlan_watchdog;
extern int wlan_wext_write; extern int wlan_wext_write;

3
drivers/staging/wlan-ng/p80211wext.c
View file

@ -52,6 +52,7 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <linux/if_ether.h> #include <linux/if_ether.h>
#include <linux/bitops.h>
/*================================================================*/ /*================================================================*/
/* Project Includes */ /* Project Includes */
@ -126,7 +127,7 @@ static const long p80211wext_channel_freq[] = {
#define NUM_CHANNELS ARRAY_SIZE(p80211wext_channel_freq) #define NUM_CHANNELS ARRAY_SIZE(p80211wext_channel_freq)
/* steal a spare bit to store the shared/opensystems state. should default to open if not set */ /* steal a spare bit to store the shared/opensystems state. should default to open if not set */
#define HOSTWEP_SHAREDKEY BIT3 #define HOSTWEP_SHAREDKEY BIT(3)
/** function declarations =============== */ /** function declarations =============== */

11
drivers/staging/wlan-ng/prism2mgmt.c
View file

@ -76,6 +76,7 @@
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <linux/random.h> #include <linux/random.h>
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/bitops.h>
#include "wlan_compat.h" #include "wlan_compat.h"
@ -94,10 +95,10 @@
#include "prism2mgmt.h" #include "prism2mgmt.h"
/* Converts 802.11 format rate specifications to prism2 */ /* Converts 802.11 format rate specifications to prism2 */
#define p80211rate_to_p2bit(n) ((((n)&~BIT7) == 2) ? BIT0 : \ #define p80211rate_to_p2bit(n) ((((n)&~BIT(7)) == 2) ? BIT(0) : \
(((n)&~BIT7) == 4) ? BIT1 : \ (((n)&~BIT(7)) == 4) ? BIT(1) : \
(((n)&~BIT7) == 11) ? BIT2 : \ (((n)&~BIT(7)) == 11) ? BIT(2) : \
(((n)&~BIT7) == 22) ? BIT3 : 0) (((n)&~BIT(7)) == 22) ? BIT(3) : 0)
/*---------------------------------------------------------------- /*----------------------------------------------------------------
* prism2mgmt_scan * prism2mgmt_scan
@ -196,7 +197,7 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp)
for (i = 0; i < msg->channellist.data.len; i++) { for (i = 0; i < msg->channellist.data.len; i++) {
u8 channel = msg->channellist.data.data[i]; u8 channel = msg->channellist.data.data[i];
if (channel > 14) continue; if (channel > 14) continue;
/* channel 1 is BIT0 ... channel 14 is BIT13 */ /* channel 1 is BIT 0 ... channel 14 is BIT 13 */
word |= (1 << (channel-1)); word |= (1 << (channel-1));
} }
scanreq.channelList = host2hfa384x_16(word); scanreq.channelList = host2hfa384x_16(word);

17
drivers/staging/wlan-ng/prism2mib.c
View file

@ -67,6 +67,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/bitops.h>
/*================================================================*/ /*================================================================*/
/* Project Includes */ /* Project Includes */
@ -996,28 +997,28 @@ void prism2mgmt_get_oprateset(u16 *rate, p80211pstrd_t *pstr)
datarate = pstr->data; datarate = pstr->data;
/* 1 Mbps */ /* 1 Mbps */
if ( BIT0 & (*rate) ) { if ( BIT(0) & (*rate) ) {
len += (u8)1; len += (u8)1;
*datarate = (u8)2; *datarate = (u8)2;
datarate++; datarate++;
} }
/* 2 Mbps */ /* 2 Mbps */
if ( BIT1 & (*rate) ) { if ( BIT(1) & (*rate) ) {
len += (u8)1; len += (u8)1;
*datarate = (u8)4; *datarate = (u8)4;
datarate++; datarate++;
} }
/* 5.5 Mbps */ /* 5.5 Mbps */
if ( BIT2 & (*rate) ) { if ( BIT(2) & (*rate) ) {
len += (u8)1; len += (u8)1;
*datarate = (u8)11; *datarate = (u8)11;
datarate++; datarate++;
} }
/* 11 Mbps */ /* 11 Mbps */
if ( BIT3 & (*rate) ) { if ( BIT(3) & (*rate) ) {
len += (u8)1; len += (u8)1;
*datarate = (u8)22; *datarate = (u8)22;
datarate++; datarate++;
@ -1055,16 +1056,16 @@ void prism2mgmt_set_oprateset(u16 *rate, p80211pstrd_t *pstr)
for ( i=0; i < pstr->len; i++, datarate++ ) { for ( i=0; i < pstr->len; i++, datarate++ ) {
switch (*datarate) { switch (*datarate) {
case 2: /* 1 Mbps */ case 2: /* 1 Mbps */
*rate |= BIT0; *rate |= BIT(0);
break; break;
case 4: /* 2 Mbps */ case 4: /* 2 Mbps */
*rate |= BIT1; *rate |= BIT(1);
break; break;
case 11: /* 5.5 Mbps */ case 11: /* 5.5 Mbps */
*rate |= BIT2; *rate |= BIT(2);
break; break;
case 22: /* 11 Mbps */ case 22: /* 11 Mbps */
*rate |= BIT3; *rate |= BIT(3);
break; break;
default: default:
WLAN_LOG_DEBUG(1, "Unrecoginzed Rate of %d\n", WLAN_LOG_DEBUG(1, "Unrecoginzed Rate of %d\n",

5
drivers/staging/wlan-ng/prism2sta.c
View file

@ -72,6 +72,7 @@
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <linux/if_arp.h> #include <linux/if_arp.h>
#include <linux/if_ether.h> #include <linux/if_ether.h>
#include <linux/bitops.h>
#include "wlan_compat.h" #include "wlan_compat.h"
@ -713,8 +714,8 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
hw->ident_sta_fw.minor = hfa384x2host_16(hw->ident_sta_fw.minor); hw->ident_sta_fw.minor = hfa384x2host_16(hw->ident_sta_fw.minor);
/* strip out the 'special' variant bits */ /* strip out the 'special' variant bits */
hw->mm_mods = hw->ident_sta_fw.variant & (BIT14 | BIT15); hw->mm_mods = hw->ident_sta_fw.variant & (BIT(14) | BIT(15));
hw->ident_sta_fw.variant &= ~((u16)(BIT14 | BIT15)); hw->ident_sta_fw.variant &= ~((u16)(BIT(14) | BIT(15)));
if ( hw->ident_sta_fw.id == 0x1f ) { if ( hw->ident_sta_fw.id == 0x1f ) {
WLAN_LOG_INFO( WLAN_LOG_INFO(

38
drivers/staging/wlan-ng/wlan_compat.h
View file

@ -48,43 +48,6 @@
#ifndef _WLAN_COMPAT_H #ifndef _WLAN_COMPAT_H
#define _WLAN_COMPAT_H #define _WLAN_COMPAT_H
/*=============================================================*/
/*------ Bit settings -----------------------------------------*/
/*=============================================================*/
#define BIT0 0x00000001
#define BIT1 0x00000002
#define BIT2 0x00000004
#define BIT3 0x00000008
#define BIT4 0x00000010
#define BIT5 0x00000020
#define BIT6 0x00000040
#define BIT7 0x00000080
#define BIT8 0x00000100
#define BIT9 0x00000200
#define BIT10 0x00000400
#define BIT11 0x00000800
#define BIT12 0x00001000
#define BIT13 0x00002000
#define BIT14 0x00004000
#define BIT15 0x00008000
#define BIT16 0x00010000
#define BIT17 0x00020000
#define BIT18 0x00040000
#define BIT19 0x00080000
#define BIT20 0x00100000
#define BIT21 0x00200000
#define BIT22 0x00400000
#define BIT23 0x00800000
#define BIT24 0x01000000
#define BIT25 0x02000000
#define BIT26 0x04000000
#define BIT27 0x08000000
#define BIT28 0x10000000
#define BIT29 0x20000000
#define BIT30 0x40000000
#define BIT31 0x80000000
/*=============================================================*/ /*=============================================================*/
/*------ OS Portability Macros --------------------------------*/ /*------ OS Portability Macros --------------------------------*/
/*=============================================================*/ /*=============================================================*/
@ -165,4 +128,3 @@ extern int wlan_debug;
#endif #endif
#endif /* _WLAN_COMPAT_H */ #endif /* _WLAN_COMPAT_H */