Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 354339
b: refs/heads/master
c: eec0d0d
h: refs/heads/master
i:
  354337: bc3f7c9
  354335: 102c541
v: v3
  • Loading branch information
Garrick He authored and Greg Kroah-Hartman committed Feb 4, 2013
1 parent e805e73 commit 11be97d
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f91f9beaa1654ce76a783fbb65fcd51a2dde29c1
refs/heads/master: eec0d0dc4e16c0c412db337acc36f95411ef946e
30 changes: 15 additions & 15 deletions trunk/drivers/staging/wlan-ng/hfa384x.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@
#define HFA384x_WEPFLAGS_EXCLUDE ((u16)BIT(1))
#define HFA384x_WEPFLAGS_DISABLE_TXCRYPT ((u16)BIT(4))
#define HFA384x_WEPFLAGS_DISABLE_RXCRYPT ((u16)BIT(7))
#define HFA384x_ROAMMODE_HOSTSCAN_HOSTROAM ((u16)3)
#define HFA384x_PORTSTATUS_DISABLED ((u16)1)
#define HFA384x_ROAMMODE_HOSTSCAN_HOSTROAM ((u16)3)
#define HFA384x_PORTSTATUS_DISABLED ((u16)1)
#define HFA384x_RATEBIT_1 ((u16)1)
#define HFA384x_RATEBIT_2 ((u16)2)
#define HFA384x_RATEBIT_5dot5 ((u16)4)
Expand Down Expand Up @@ -164,7 +164,7 @@
#define HFA384x_CMDCODE_DOWNLD ((u16)0x22)

/*--- Debugging Commands -----------------------------*/
#define HFA384x_CMDCODE_MONITOR ((u16)(0x38))
#define HFA384x_CMDCODE_MONITOR ((u16)(0x38))
#define HFA384x_MONITOR_ENABLE ((u16)(0x0b))
#define HFA384x_MONITOR_DISABLE ((u16)(0x0f))

Expand Down Expand Up @@ -275,15 +275,15 @@ API ENHANCEMENTS (NOT ALREADY IMPLEMENTED)
#define HFA384x_RID_CNFAUTHENTICATION ((u16)0xFC2A)
#define HFA384x_RID_CNFROAMINGMODE ((u16)0xFC2D)
#define HFA384x_RID_CNFAPBCNint ((u16)0xFC33)
#define HFA384x_RID_CNFDBMADJUST ((u16)0xFC46)
#define HFA384x_RID_CNFWPADATA ((u16)0xFC48)
#define HFA384x_RID_CNFDBMADJUST ((u16)0xFC46)
#define HFA384x_RID_CNFWPADATA ((u16)0xFC48)
#define HFA384x_RID_CNFBASICRATES ((u16)0xFCB3)
#define HFA384x_RID_CNFSUPPRATES ((u16)0xFCB4)
#define HFA384x_RID_CNFPASSIVESCANCTRL ((u16)0xFCBA)
#define HFA384x_RID_TXPOWERMAX ((u16)0xFCBE)
#define HFA384x_RID_TXPOWERMAX ((u16)0xFCBE)
#define HFA384x_RID_JOINREQUEST ((u16)0xFCE2)
#define HFA384x_RID_AUTHENTICATESTA ((u16)0xFCE3)
#define HFA384x_RID_HOSTSCAN ((u16)0xFCE5)
#define HFA384x_RID_HOSTSCAN ((u16)0xFCE5)

#define HFA384x_RID_CNFWEPDEFAULTKEY_LEN ((u16)6)
#define HFA384x_RID_CNFWEP128DEFAULTKEY_LEN ((u16)14)
Expand Down Expand Up @@ -311,7 +311,7 @@ PD Record codes
#define HFA384x_PDR_HFA3861_IFRF ((u16)0x0204)
#define HFA384x_PDR_HFA3861_CHCALSP ((u16)0x0300)
#define HFA384x_PDR_HFA3861_CHCALI ((u16)0x0301)
#define HFA384x_PDR_MAX_TX_POWER ((u16)0x0302)
#define HFA384x_PDR_MAX_TX_POWER ((u16)0x0302)
#define HFA384x_PDR_MASTER_CHAN_LIST ((u16)0x0303)
#define HFA384x_PDR_3842_NIC_CONFIG ((u16)0x0400)
#define HFA384x_PDR_USB_ID ((u16)0x0401)
Expand All @@ -322,10 +322,10 @@ PD Record codes
#define HFA384x_PDR_USB_POWER_TYPE ((u16)0x0407)
#define HFA384x_PDR_USB_MAX_POWER ((u16)0x0409)
#define HFA384x_PDR_USB_MANUFACTURER ((u16)0x0410)
#define HFA384x_PDR_USB_PRODUCT ((u16)0x0411)
#define HFA384x_PDR_ANT_DIVERSITY ((u16)0x0412)
#define HFA384x_PDR_HFO_DELAY ((u16)0x0413)
#define HFA384x_PDR_SCALE_THRESH ((u16)0x0414)
#define HFA384x_PDR_USB_PRODUCT ((u16)0x0411)
#define HFA384x_PDR_ANT_DIVERSITY ((u16)0x0412)
#define HFA384x_PDR_HFO_DELAY ((u16)0x0413)
#define HFA384x_PDR_SCALE_THRESH ((u16)0x0414)

#define HFA384x_PDR_HFA3861_MANF_TESTSP ((u16)0x0900)
#define HFA384x_PDR_HFA3861_MANF_TESTI ((u16)0x0901)
Expand Down Expand Up @@ -383,7 +383,7 @@ typedef struct hfa384x_caplevel {
/*-- Configuration Record: cnfAuthentication --*/
#define HFA384x_CNFAUTHENTICATION_OPENSYSTEM 0x0001
#define HFA384x_CNFAUTHENTICATION_SHAREDKEY 0x0002
#define HFA384x_CNFAUTHENTICATION_LEAP 0x0004
#define HFA384x_CNFAUTHENTICATION_LEAP 0x0004

/*--------------------------------------------------------------------
Configuration Record Structures:
Expand Down Expand Up @@ -575,8 +575,8 @@ Information Types
#define HFA384x_IT_AUTHREQ ((u16)0xF202UL)
#define HFA384x_IT_PSUSERCNT ((u16)0xF203UL)
#define HFA384x_IT_KEYIDCHANGED ((u16)0xF204UL)
#define HFA384x_IT_ASSOCREQ ((u16)0xF205UL)
#define HFA384x_IT_MICFAILURE ((u16)0xF206UL)
#define HFA384x_IT_ASSOCREQ ((u16)0xF205UL)
#define HFA384x_IT_MICFAILURE ((u16)0xF206UL)

/*--------------------------------------------------------------------
Information Frames Structures
Expand Down

0 comments on commit 11be97d

Please sign in to comment.