11 files changed, 2678 insertions, 0 deletions
diff --git a/drivers/net/wireless/bcm4329/include/proto/802.11.h b/drivers/net/wireless/bcm4329/include/proto/802.11.h
new file mode 100644
index 00000000000..fd26317361d
--- /dev/null
+++ b/drivers/net/wireless/bcm4329/include/proto/802.11.h
@@ -0,0 +1,1433 @@
+/*
+ * Copyright (C) 1999-2010, Broadcom Corporation
+ * 
+ *      Unless you and Broadcom execute a separate written software license
+ * agreement governing use of this software, this software is licensed to you
+ * under the terms of the GNU General Public License version 2 (the "GPL"),
+ * available at http://www.broadcom.com/licenses/GPLv2.php, with the
+ * following added to such license:
+ * 
+ *      As a special exception, the copyright holders of this software give you
+ * permission to link this software with independent modules, and to copy and
+ * distribute the resulting executable under terms of your choice, provided that
+ * you also meet, for each linked independent module, the terms and conditions of
+ * the license of that module.  An independent module is a module which is not
+ * derived from this software.  The special exception does not apply to any
+ * modifications of the software.
+ * 
+ *      Notwithstanding the above, under no circumstances may you combine this
+ * software in any way with any other Broadcom software provided under a license
+ * other than the GPL, without Broadcom's express prior written consent.
+ *
+ * Fundamental types and constants relating to 802.11
+ *
+ * $Id: 802.11.h,v 9.219.4.1.4.5.6.11 2010/02/09 13:23:26 Exp $
+ */
+#ifndef _802_11_H_
+#define _802_11_H_
+#ifndef _TYPEDEFS_H_
+#include <typedefs.h>
+#endif
+#ifndef _NET_ETHERNET_H_
+#include <proto/ethernet.h>
+#endif
+#include <proto/wpa.h>
+#include <packed_section_start.h>
+#define DOT11_TU_TO_US                  1024    
+#define DOT11_A3_HDR_LEN                24      
+#define DOT11_A4_HDR_LEN                30      
+#define DOT11_MAC_HDR_LEN               DOT11_A3_HDR_LEN        
+#define DOT11_FCS_LEN                   4       
+#define DOT11_ICV_LEN                   4       
+#define DOT11_ICV_AES_LEN               8       
+#define DOT11_QOS_LEN                   2       
+#define DOT11_HTC_LEN                   4       
+#define DOT11_KEY_INDEX_SHIFT           6       
+#define DOT11_IV_LEN                    4       
+#define DOT11_IV_TKIP_LEN               8       
+#define DOT11_IV_AES_OCB_LEN            4       
+#define DOT11_IV_AES_CCM_LEN            8       
+#define DOT11_IV_MAX_LEN                8       
+#define DOT11_MAX_MPDU_BODY_LEN         2304    
+#define DOT11_MAX_MPDU_LEN              (DOT11_A4_HDR_LEN + \
+                                         DOT11_QOS_LEN + \
+                                         DOT11_IV_AES_CCM_LEN + \
+                                         DOT11_MAX_MPDU_BODY_LEN + \
+                                         DOT11_ICV_LEN + \
+                                         DOT11_FCS_LEN) 
+#define DOT11_MAX_SSID_LEN              32      
+#define DOT11_DEFAULT_RTS_LEN           2347    
+#define DOT11_MAX_RTS_LEN               2347    
+#define DOT11_MIN_FRAG_LEN              256     
+#define DOT11_MAX_FRAG_LEN              2346    
+#define DOT11_DEFAULT_FRAG_LEN          2346    
+#define DOT11_MIN_BEACON_PERIOD         1       
+#define DOT11_MAX_BEACON_PERIOD         0xFFFF  
+#define DOT11_MIN_DTIM_PERIOD           1       
+#define DOT11_MAX_DTIM_PERIOD           0xFF    
+#define DOT11_LLC_SNAP_HDR_LEN          8       
+#define DOT11_OUI_LEN                   3       
+BWL_PRE_PACKED_STRUCT struct dot11_llc_snap_header {
+        uint8   dsap;                           
+        uint8   ssap;                           
+        uint8   ctl;                            
+        uint8   oui[DOT11_OUI_LEN];             
+        uint16  type;                           
+} BWL_POST_PACKED_STRUCT;
+#define RFC1042_HDR_LEN (ETHER_HDR_LEN + DOT11_LLC_SNAP_HDR_LEN)        
+BWL_PRE_PACKED_STRUCT struct dot11_header {
+        uint16                  fc;             
+        uint16                  durid;          
+        struct ether_addr       a1;             
+        struct ether_addr       a2;             
+        struct ether_addr       a3;             
+        uint16                  seq;            
+        struct ether_addr       a4;             
+} BWL_POST_PACKED_STRUCT;
+BWL_PRE_PACKED_STRUCT struct dot11_rts_frame {
+        uint16                  fc;             
+        uint16                  durid;          
+        struct ether_addr       ra;             
+        struct ether_addr       ta;             
+} BWL_POST_PACKED_STRUCT;
+#define DOT11_RTS_LEN           16              
+BWL_PRE_PACKED_STRUCT struct dot11_cts_frame {
+        uint16                  fc;             
+        uint16                  durid;          
+        struct ether_addr       ra;             
+} BWL_POST_PACKED_STRUCT;
+#define DOT11_CTS_LEN           10              
+BWL_PRE_PACKED_STRUCT struct dot11_ack_frame {
+        uint16                  fc;             
+        uint16                  durid;          
+        struct ether_addr       ra;             
+} BWL_POST_PACKED_STRUCT;
+#define DOT11_ACK_LEN           10              
+BWL_PRE_PACKED_STRUCT struct dot11_ps_poll_frame {
+        uint16                  fc;             
+        uint16                  durid;          
+        struct ether_addr       bssid;          
+        struct ether_addr       ta;             
+} BWL_POST_PACKED_STRUCT;
+#define DOT11_PS_POLL_LEN       16              
+BWL_PRE_PACKED_STRUCT struct dot11_cf_end_frame {
+        uint16                  fc;             
+        uint16                  durid;          
+        struct ether_addr       ra;             
+        struct ether_addr       bssid;          
+} BWL_POST_PACKED_STRUCT;
+#define DOT11_CS_END_LEN        16              
+BWL_PRE_PACKED_STRUCT struct dot11_action_wifi_vendor_specific {
+        uint8   category;
+        uint8   OUI[3];
+        uint8   type;
+        uint8   subtype;
+        uint8   data[1040];
+        struct dot11_action_wifi_vendor_specific* next_node;
+} BWL_POST_PACKED_STRUCT;
+typedef struct dot11_action_wifi_vendor_specific dot11_action_wifi_vendor_specific_t;
+#define DOT11_BA_CTL_POLICY_NORMAL      0x0000  
+#define DOT11_BA_CTL_POLICY_NOACK       0x0001  
+#define DOT11_BA_CTL_POLICY_MASK        0x0001  
+#define DOT11_BA_CTL_MTID               0x0002  
+#define DOT11_BA_CTL_COMPRESSED         0x0004  
+#define DOT11_BA_CTL_NUMMSDU_MASK       0x0FC0  
+#define DOT11_BA_CTL_NUMMSDU_SHIFT      6       
+#define DOT11_BA_CTL_TID_MASK           0xF000  
+#define DOT11_BA_CTL_TID_SHIFT          12      
+BWL_PRE_PACKED_STRUCT struct dot11_ctl_header {
+        uint16                  fc;             
+        uint16                  durid;          
+        struct ether_addr       ra;             
+        struct ether_addr       ta;             
+} BWL_POST_PACKED_STRUCT;
+#define DOT11_CTL_HDR_LEN       16              
+BWL_PRE_PACKED_STRUCT struct dot11_bar {
+        uint16                  bar_control;    
+        uint16                  seqnum;         
+} BWL_POST_PACKED_STRUCT;
+#define DOT11_BAR_LEN           4               
+#define DOT11_BA_BITMAP_LEN     128             
+#define DOT11_BA_CMP_BITMAP_LEN 8               
+BWL_PRE_PACKED_STRUCT struct dot11_ba {
+        uint16                  ba_control;     
+        uint16                  seqnum;         
+        uint8                   bitmap[DOT11_BA_BITMAP_LEN];    
+} BWL_POST_PACKED_STRUCT;
+#define DOT11_BA_LEN            4               
+BWL_PRE_PACKED_STRUCT struct dot11_management_header {
+        uint16                  fc;             
+        uint16                  durid;          
+        struct ether_addr       da;             
+        struct ether_addr       sa;             
+        struct ether_addr       bssid;          
+        uint16                  seq;            
+} BWL_POST_PACKED_STRUCT;
+#define DOT11_MGMT_HDR_LEN      24              
+BWL_PRE_PACKED_STRUCT struct dot11_bcn_prb {
+        uint32                  timestamp[2];
+        uint16                  beacon_interval;
+        uint16                  capability;
+} BWL_POST_PACKED_STRUCT;
+#define DOT11_BCN_PRB_LEN       12              
+BWL_PRE_PACKED_STRUCT struct dot11_auth {
+        uint16                  alg;            
+        uint16                  seq;            
+        uint16                  status;         
+} BWL_POST_PACKED_STRUCT;
+#define DOT11_AUTH_FIXED_LEN    6               
+BWL_PRE_PACKED_STRUCT struct dot11_assoc_req {
+        uint16                  capability;     
+        uint16                  listen;         
+} BWL_POST_PACKED_STRUCT;
+#define DOT11_ASSOC_REQ_FIXED_LEN       4       
+BWL_PRE_PACKED_STRUCT struct dot11_reassoc_req {
+        uint16                  capability;     
+        uint16                  listen;         
+        struct ether_addr       ap;             
+} BWL_POST_PACKED_STRUCT;
+#define DOT11_REASSOC_REQ_FIXED_LEN     10      
+BWL_PRE_PACKED_STRUCT struct dot11_assoc_resp {
+        uint16                  capability;     
+        uint16                  status;         
+        uint16                  aid;            
+} BWL_POST_PACKED_STRUCT;
+#define DOT11_ASSOC_RESP_FIXED_LEN      6       
+BWL_PRE_PACKED_STRUCT struct dot11_action_measure {
+        uint8   category;
+        uint8   action;
+        uint8   token;
+        uint8   data[1];
+} BWL_POST_PACKED_STRUCT;
+#define DOT11_ACTION_MEASURE_LEN        3       
+BWL_PRE_PACKED_STRUCT struct dot11_action_ht_ch_width {
+        uint8   category;
+        uint8   action;
+        uint8   ch_width;
+} BWL_POST_PACKED_STRUCT;
+BWL_PRE_PACKED_STRUCT struct dot11_action_ht_mimops {
+        uint8   category;
+        uint8   action;
+        uint8   control;
+} BWL_POST_PACKED_STRUCT;
+#define SM_PWRSAVE_ENABLE       1
+#define SM_PWRSAVE_MODE         2
+BWL_PRE_PACKED_STRUCT struct dot11_power_cnst {
+        uint8 id;
+        uint8 len;
+        uint8 power;
+} BWL_POST_PACKED_STRUCT;
+typedef struct dot11_power_cnst dot11_power_cnst_t;
+BWL_PRE_PACKED_STRUCT struct dot11_power_cap {
+        uint8 min;
+        uint8 max;
+} BWL_POST_PACKED_STRUCT;
+typedef struct dot11_power_cap dot11_power_cap_t;
+BWL_PRE_PACKED_STRUCT struct dot11_tpc_rep {
+        uint8 id;
+        uint8 len;
+        uint8 tx_pwr;
+        uint8 margin;
+} BWL_POST_PACKED_STRUCT;
+typedef struct dot11_tpc_rep dot11_tpc_rep_t;
+#define DOT11_MNG_IE_TPC_REPORT_LEN     2       
+BWL_PRE_PACKED_STRUCT struct dot11_supp_channels {
+        uint8 id;
+        uint8 len;
+        uint8 first_channel;
+        uint8 num_channels;
+} BWL_POST_PACKED_STRUCT;
+typedef struct dot11_supp_channels dot11_supp_channels_t;
+BWL_PRE_PACKED_STRUCT struct dot11_extch {
+        uint8   id;             
+        uint8   len;            
+        uint8   extch;
+} BWL_POST_PACKED_STRUCT;
+typedef struct dot11_extch dot11_extch_ie_t;
+BWL_PRE_PACKED_STRUCT struct dot11_brcm_extch {
+        uint8   id;             
+        uint8   len;            
+        uint8   oui[3];         
+        uint8   type;           
+        uint8   extch;
+} BWL_POST_PACKED_STRUCT;
+typedef struct dot11_brcm_extch dot11_brcm_extch_ie_t;
+#define BRCM_EXTCH_IE_LEN       5
+#define BRCM_EXTCH_IE_TYPE      53      
+#define DOT11_EXTCH_IE_LEN      1
+#define DOT11_EXT_CH_MASK       0x03    
+#define DOT11_EXT_CH_UPPER      0x01    
+#define DOT11_EXT_CH_LOWER      0x03    
+#define DOT11_EXT_CH_NONE       0x00    
+BWL_PRE_PACKED_STRUCT struct dot11_action_frmhdr {
+        uint8   category;
+        uint8   action;
+        uint8   data[1];
+} BWL_POST_PACKED_STRUCT;
+#define DOT11_ACTION_FRMHDR_LEN 2
+BWL_PRE_PACKED_STRUCT struct dot11_channel_switch {
+        uint8 id;       
+        uint8 len;      
+        uint8 mode;     
+        uint8 channel;  
+        uint8 count;    
+} BWL_POST_PACKED_STRUCT;
+typedef struct dot11_channel_switch dot11_chan_switch_ie_t;
+#define DOT11_SWITCH_IE_LEN     3       
+#define DOT11_CSA_MODE_ADVISORY         0       
+#define DOT11_CSA_MODE_NO_TX            1       
+BWL_PRE_PACKED_STRUCT struct dot11_action_switch_channel {
+        uint8   category;
+        uint8   action;
+        dot11_chan_switch_ie_t chan_switch_ie;  
+        dot11_brcm_extch_ie_t extch_ie;         
+} BWL_POST_PACKED_STRUCT;
+BWL_PRE_PACKED_STRUCT struct dot11_csa_body {
+        uint8 mode;     
+        uint8 reg;      
+        uint8 channel;  
+        uint8 count;    
+} BWL_POST_PACKED_STRUCT;
+BWL_PRE_PACKED_STRUCT struct dot11_ext_csa {
+        uint8 id;       
+        uint8 len;      
+        struct dot11_csa_body b; 
+} BWL_POST_PACKED_STRUCT;
+BWL_PRE_PACKED_STRUCT struct dot11y_action_ext_csa {
+        uint8   category;
+        uint8   action;
+        struct dot11_csa_body b;        
+} BWL_POST_PACKED_STRUCT;
+typedef struct dot11_ext_csa dot11_ext_csa_ie_t;
+#define DOT11_EXT_CSA_IE_LEN    4       
+BWL_PRE_PACKED_STRUCT struct dot11_action_ext_csa {
+        uint8   category;
+        uint8   action;
+        dot11_ext_csa_ie_t chan_switch_ie;      
+} BWL_POST_PACKED_STRUCT;
+BWL_PRE_PACKED_STRUCT struct dot11_obss_coex {
+        uint8   id;
+        uint8   len;
+        uint8   info;
+} BWL_POST_PACKED_STRUCT;
+typedef struct dot11_obss_coex dot11_obss_coex_t;
+#define DOT11_OBSS_COEXINFO_LEN 1       
+#define DOT11_OBSS_COEX_INFO_REQ                0x01
+#define DOT11_OBSS_COEX_40MHZ_INTOLERANT        0x02
+#define DOT11_OBSS_COEX_20MHZ_WIDTH_REQ 0x04
+BWL_PRE_PACKED_STRUCT struct dot11_obss_chanlist {
+        uint8   id;
+        uint8   len;
+        uint8   regclass;
+        uint8   chanlist[1];
+} BWL_POST_PACKED_STRUCT;
+typedef struct dot11_obss_chanlist dot11_obss_chanlist_t;
+#define DOT11_OBSS_CHANLIST_FIXED_LEN   1       
+BWL_PRE_PACKED_STRUCT struct dot11_extcap_ie {
+        uint8 id;
+        uint8 len;
+        uint8 cap;
+} BWL_POST_PACKED_STRUCT;
+typedef struct dot11_extcap_ie dot11_extcap_ie_t;
+#define DOT11_EXTCAP_LEN        1
+#define DOT11_MEASURE_TYPE_BASIC        0       
+#define DOT11_MEASURE_TYPE_CCA          1       
+#define DOT11_MEASURE_TYPE_RPI          2       
+#define DOT11_MEASURE_MODE_ENABLE       (1<<1)  
+#define DOT11_MEASURE_MODE_REQUEST      (1<<2)  
+#define DOT11_MEASURE_MODE_REPORT       (1<<3)  
+#define DOT11_MEASURE_MODE_LATE         (1<<0)  
+#define DOT11_MEASURE_MODE_INCAPABLE    (1<<1)  
+#define DOT11_MEASURE_MODE_REFUSED      (1<<2)  
+#define DOT11_MEASURE_BASIC_MAP_BSS     ((uint8)(1<<0)) 
+#define DOT11_MEASURE_BASIC_MAP_OFDM    ((uint8)(1<<1)) 
+#define DOT11_MEASURE_BASIC_MAP_UKNOWN  ((uint8)(1<<2)) 
+#define DOT11_MEASURE_BASIC_MAP_RADAR   ((uint8)(1<<3)) 
+#define DOT11_MEASURE_BASIC_MAP_UNMEAS  ((uint8)(1<<4)) 
+BWL_PRE_PACKED_STRUCT struct dot11_meas_req {
+        uint8 id;
+        uint8 len;
+        uint8 token;
+        uint8 mode;
+        uint8 type;
+        uint8 channel;
+        uint8 start_time[8];
+        uint16 duration;
+} BWL_POST_PACKED_STRUCT;
+typedef struct dot11_meas_req dot11_meas_req_t;
+#define DOT11_MNG_IE_MREQ_LEN 14        
+#define DOT11_MNG_IE_MREQ_FIXED_LEN 3   
+BWL_PRE_PACKED_STRUCT struct dot11_meas_rep {
+        uint8 id;
+        uint8 len;
+        uint8 token;
+        uint8 mode;
+        uint8 type;
+        BWL_PRE_PACKED_STRUCT union
+        {
+                BWL_PRE_PACKED_STRUCT struct {
+                        uint8 channel;
+                        uint8 start_time[8];
+                        uint16 duration;
+                        uint8 map;
+                } BWL_POST_PACKED_STRUCT basic;
+                uint8 data[1];
+        } BWL_POST_PACKED_STRUCT rep;
+} BWL_POST_PACKED_STRUCT;
+typedef struct dot11_meas_rep dot11_meas_rep_t;
+#define DOT11_MNG_IE_MREP_FIXED_LEN     3       
+BWL_PRE_PACKED_STRUCT struct dot11_meas_rep_basic {
+        uint8 channel;
+        uint8 start_time[8];
+        uint16 duration;
+        uint8 map;
+} BWL_POST_PACKED_STRUCT;
+typedef struct dot11_meas_rep_basic dot11_meas_rep_basic_t;
+#define DOT11_MEASURE_BASIC_REP_LEN     12      
+BWL_PRE_PACKED_STRUCT struct dot11_quiet {
+        uint8 id;
+        uint8 len;
+        uint8 count;    
+        uint8 period;   
+        uint16 duration;        
+        uint16 offset;  
+} BWL_POST_PACKED_STRUCT;
+typedef struct dot11_quiet dot11_quiet_t;
+BWL_PRE_PACKED_STRUCT struct chan_map_tuple {
+        uint8 channel;
+        uint8 map;
+} BWL_POST_PACKED_STRUCT;
+typedef struct chan_map_tuple chan_map_tuple_t;
+BWL_PRE_PACKED_STRUCT struct dot11_ibss_dfs {
+        uint8 id;
+        uint8 len;
+        uint8 eaddr[ETHER_ADDR_LEN];
+        uint8 interval;
+        chan_map_tuple_t map[1];
+} BWL_POST_PACKED_STRUCT;
+typedef struct dot11_ibss_dfs dot11_ibss_dfs_t;
+#define WME_OUI                 "\x00\x50\xf2"  
+#define WME_VER                 1       
+#define WME_TYPE                2       
+#define WME_SUBTYPE_IE          0       
+#define WME_SUBTYPE_PARAM_IE    1       
+#define WME_SUBTYPE_TSPEC       2       
+#define AC_BE                   0       
+#define AC_BK                   1       
+#define AC_VI                   2       
+#define AC_VO                   3       
+#define AC_COUNT                4       
+typedef uint8 ac_bitmap_t;      
+#define AC_BITMAP_NONE          0x0     
+#define AC_BITMAP_ALL           0xf     
+#define AC_BITMAP_TST(ab, ac)   (((ab) & (1 << (ac))) != 0)
+#define AC_BITMAP_SET(ab, ac)   (((ab) |= (1 << (ac))))
+#define AC_BITMAP_RESET(ab, ac) (((ab) &= ~(1 << (ac))))
+BWL_PRE_PACKED_STRUCT struct wme_ie {
+        uint8 oui[3];
+        uint8 type;
+        uint8 subtype;
+        uint8 version;
+        uint8 qosinfo;
+} BWL_POST_PACKED_STRUCT;
+typedef struct wme_ie wme_ie_t;
+#define WME_IE_LEN 7    
+BWL_PRE_PACKED_STRUCT struct edcf_acparam {
+        uint8   ACI;
+        uint8   ECW;
+        uint16  TXOP;           
+} BWL_POST_PACKED_STRUCT;
+typedef struct edcf_acparam edcf_acparam_t;
+BWL_PRE_PACKED_STRUCT struct wme_param_ie {
+        uint8 oui[3];
+        uint8 type;
+        uint8 subtype;
+        uint8 version;
+        uint8 qosinfo;
+        uint8 rsvd;
+        edcf_acparam_t acparam[AC_COUNT];
+} BWL_POST_PACKED_STRUCT;
+typedef struct wme_param_ie wme_param_ie_t;
+#define WME_PARAM_IE_LEN            24          
+#define WME_QI_AP_APSD_MASK         0x80        
+#define WME_QI_AP_APSD_SHIFT        7           
+#define WME_QI_AP_COUNT_MASK        0x0f        
+#define WME_QI_AP_COUNT_SHIFT       0           
+#define WME_QI_STA_MAXSPLEN_MASK    0x60        
+#define WME_QI_STA_MAXSPLEN_SHIFT   5           
+#define WME_QI_STA_APSD_ALL_MASK    0xf         
+#define WME_QI_STA_APSD_ALL_SHIFT   0           
+#define WME_QI_STA_APSD_BE_MASK     0x8         
+#define WME_QI_STA_APSD_BE_SHIFT    3           
+#define WME_QI_STA_APSD_BK_MASK     0x4         
+#define WME_QI_STA_APSD_BK_SHIFT    2           
+#define WME_QI_STA_APSD_VI_MASK     0x2         
+#define WME_QI_STA_APSD_VI_SHIFT    1           
+#define WME_QI_STA_APSD_VO_MASK     0x1         
+#define WME_QI_STA_APSD_VO_SHIFT    0           
+#define EDCF_AIFSN_MIN               1           
+#define EDCF_AIFSN_MAX               15          
+#define EDCF_AIFSN_MASK              0x0f        
+#define EDCF_ACM_MASK                0x10        
+#define EDCF_ACI_MASK                0x60        
+#define EDCF_ACI_SHIFT               5           
+#define EDCF_AIFSN_SHIFT             12          
+#define EDCF_ECW_MIN                 0           
+#define EDCF_ECW_MAX                 15          
+#define EDCF_ECW2CW(exp)             ((1 << (exp)) - 1)
+#define EDCF_ECWMIN_MASK             0x0f        
+#define EDCF_ECWMAX_MASK             0xf0        
+#define EDCF_ECWMAX_SHIFT            4           
+#define EDCF_TXOP_MIN                0           
+#define EDCF_TXOP_MAX                65535       
+#define EDCF_TXOP2USEC(txop)         ((txop) << 5)
+#define NON_EDCF_AC_BE_ACI_STA          0x02
+#define EDCF_AC_BE_ACI_STA           0x03       
+#define EDCF_AC_BE_ECW_STA           0xA4       
+#define EDCF_AC_BE_TXOP_STA          0x0000     
+#define EDCF_AC_BK_ACI_STA           0x27       
+#define EDCF_AC_BK_ECW_STA           0xA4       
+#define EDCF_AC_BK_TXOP_STA          0x0000     
+#define EDCF_AC_VI_ACI_STA           0x42       
+#define EDCF_AC_VI_ECW_STA           0x43       
+#define EDCF_AC_VI_TXOP_STA          0x005e     
+#define EDCF_AC_VO_ACI_STA           0x62       
+#define EDCF_AC_VO_ECW_STA           0x32       
+#define EDCF_AC_VO_TXOP_STA          0x002f     
+#define EDCF_AC_BE_ACI_AP            0x03       
+#define EDCF_AC_BE_ECW_AP            0x64       
+#define EDCF_AC_BE_TXOP_AP           0x0000     
+#define EDCF_AC_BK_ACI_AP            0x27       
+#define EDCF_AC_BK_ECW_AP            0xA4       
+#define EDCF_AC_BK_TXOP_AP           0x0000     
+#define EDCF_AC_VI_ACI_AP            0x41       
+#define EDCF_AC_VI_ECW_AP            0x43       
+#define EDCF_AC_VI_TXOP_AP           0x005e     
+#define EDCF_AC_VO_ACI_AP            0x61       
+#define EDCF_AC_VO_ECW_AP            0x32       
+#define EDCF_AC_VO_TXOP_AP           0x002f     
+BWL_PRE_PACKED_STRUCT struct edca_param_ie {
+        uint8 qosinfo;
+        uint8 rsvd;
+        edcf_acparam_t acparam[AC_COUNT];
+} BWL_POST_PACKED_STRUCT;
+typedef struct edca_param_ie edca_param_ie_t;
+#define EDCA_PARAM_IE_LEN            18          
+BWL_PRE_PACKED_STRUCT struct qos_cap_ie {
+        uint8 qosinfo;
+} BWL_POST_PACKED_STRUCT;
+typedef struct qos_cap_ie qos_cap_ie_t;
+BWL_PRE_PACKED_STRUCT struct dot11_qbss_load_ie {
+        uint8 id;                       
+        uint8 length;
+        uint16 station_count;           
+        uint8 channel_utilization;      
+        uint16 aac;                     
+} BWL_POST_PACKED_STRUCT;
+typedef struct dot11_qbss_load_ie dot11_qbss_load_ie_t;
+#define FIXED_MSDU_SIZE 0x8000          
+#define MSDU_SIZE_MASK  0x7fff          
+#define INTEGER_SHIFT   13      
+#define FRACTION_MASK   0x1FFF  
+BWL_PRE_PACKED_STRUCT struct dot11_management_notification {
+        uint8 category;                 
+        uint8 action;
+        uint8 token;
+        uint8 status;
+        uint8 data[1];                  
+} BWL_POST_PACKED_STRUCT;
+#define DOT11_MGMT_NOTIFICATION_LEN 4   
+#define WME_ADDTS_REQUEST       0       
+#define WME_ADDTS_RESPONSE      1       
+#define WME_DELTS_REQUEST       2       
+#define WME_ADMISSION_ACCEPTED          0       
+#define WME_INVALID_PARAMETERS          1       
+#define WME_ADMISSION_REFUSED           3       
+#define BCN_PRB_SSID(body) ((char*)(body) + DOT11_BCN_PRB_LEN)
+#define DOT11_OPEN_SYSTEM       0       
+#define DOT11_SHARED_KEY        1       
+#define DOT11_OPEN_SHARED       2       
+#define DOT11_CHALLENGE_LEN     128     
+#define FC_PVER_MASK            0x3     
+#define FC_PVER_SHIFT           0       
+#define FC_TYPE_MASK            0xC     
+#define FC_TYPE_SHIFT           2       
+#define FC_SUBTYPE_MASK         0xF0    
+#define FC_SUBTYPE_SHIFT        4       
+#define FC_TODS                 0x100   
+#define FC_TODS_SHIFT           8       
+#define FC_FROMDS               0x200   
+#define FC_FROMDS_SHIFT         9       
+#define FC_MOREFRAG             0x400   
+#define FC_MOREFRAG_SHIFT       10      
+#define FC_RETRY                0x800   
+#define FC_RETRY_SHIFT          11      
+#define FC_PM                   0x1000  
+#define FC_PM_SHIFT             12      
+#define FC_MOREDATA             0x2000  
+#define FC_MOREDATA_SHIFT       13      
+#define FC_WEP                  0x4000  
+#define FC_WEP_SHIFT            14      
+#define FC_ORDER                0x8000  
+#define FC_ORDER_SHIFT          15      
+#define SEQNUM_SHIFT            4       
+#define SEQNUM_MAX              0x1000  
+#define FRAGNUM_MASK            0xF     
+#define FC_TYPE_MNG             0       
+#define FC_TYPE_CTL             1       
+#define FC_TYPE_DATA            2       
+#define FC_SUBTYPE_ASSOC_REQ            0       
+#define FC_SUBTYPE_ASSOC_RESP           1       
+#define FC_SUBTYPE_REASSOC_REQ          2       
+#define FC_SUBTYPE_REASSOC_RESP         3       
+#define FC_SUBTYPE_PROBE_REQ            4       
+#define FC_SUBTYPE_PROBE_RESP           5       
+#define FC_SUBTYPE_BEACON               8       
+#define FC_SUBTYPE_ATIM                 9       
+#define FC_SUBTYPE_DISASSOC             10      
+#define FC_SUBTYPE_AUTH                 11      
+#define FC_SUBTYPE_DEAUTH               12      
+#define FC_SUBTYPE_ACTION               13      
+#define FC_SUBTYPE_ACTION_NOACK         14      
+#define FC_SUBTYPE_CTL_WRAPPER          7       
+#define FC_SUBTYPE_BLOCKACK_REQ         8       
+#define FC_SUBTYPE_BLOCKACK             9       
+#define FC_SUBTYPE_PS_POLL              10      
+#define FC_SUBTYPE_RTS                  11      
+#define FC_SUBTYPE_CTS                  12      
+#define FC_SUBTYPE_ACK                  13      
+#define FC_SUBTYPE_CF_END               14      
+#define FC_SUBTYPE_CF_END_ACK           15      
+#define FC_SUBTYPE_DATA                 0       
+#define FC_SUBTYPE_DATA_CF_ACK          1       
+#define FC_SUBTYPE_DATA_CF_POLL         2       
+#define FC_SUBTYPE_DATA_CF_ACK_POLL     3       
+#define FC_SUBTYPE_NULL                 4       
+#define FC_SUBTYPE_CF_ACK               5       
+#define FC_SUBTYPE_CF_POLL              6       
+#define FC_SUBTYPE_CF_ACK_POLL          7       
+#define FC_SUBTYPE_QOS_DATA             8       
+#define FC_SUBTYPE_QOS_DATA_CF_ACK      9       
+#define FC_SUBTYPE_QOS_DATA_CF_POLL     10      
+#define FC_SUBTYPE_QOS_DATA_CF_ACK_POLL 11      
+#define FC_SUBTYPE_QOS_NULL             12      
+#define FC_SUBTYPE_QOS_CF_POLL          14      
+#define FC_SUBTYPE_QOS_CF_ACK_POLL      15      
+#define FC_SUBTYPE_ANY_QOS(s)           (((s) & 8) != 0)
+#define FC_SUBTYPE_ANY_NULL(s)          (((s) & 4) != 0)
+#define FC_SUBTYPE_ANY_CF_POLL(s)       (((s) & 2) != 0)
+#define FC_SUBTYPE_ANY_CF_ACK(s)        (((s) & 1) != 0)
+#define FC_KIND_MASK            (FC_TYPE_MASK | FC_SUBTYPE_MASK)        
+#define FC_KIND(t, s)   (((t) << FC_TYPE_SHIFT) | ((s) << FC_SUBTYPE_SHIFT))    
+#define FC_SUBTYPE(fc)  (((fc) & FC_SUBTYPE_MASK) >> FC_SUBTYPE_SHIFT)  
+#define FC_TYPE(fc)     (((fc) & FC_TYPE_MASK) >> FC_TYPE_SHIFT)        
+#define FC_ASSOC_REQ    FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_ASSOC_REQ)      
+#define FC_ASSOC_RESP   FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_ASSOC_RESP)     
+#define FC_REASSOC_REQ  FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_REASSOC_REQ)    
+#define FC_REASSOC_RESP FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_REASSOC_RESP)   
+#define FC_PROBE_REQ    FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_PROBE_REQ)      
+#define FC_PROBE_RESP   FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_PROBE_RESP)     
+#define FC_BEACON       FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_BEACON)         
+#define FC_DISASSOC     FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_DISASSOC)       
+#define FC_AUTH         FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_AUTH)           
+#define FC_DEAUTH       FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_DEAUTH)         
+#define FC_ACTION       FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_ACTION)         
+#define FC_ACTION_NOACK FC_KIND(FC_TYPE_MNG, FC_SUBTYPE_ACTION_NOACK)   
+#define FC_CTL_WRAPPER  FC_KIND(FC_TYPE_CTL, FC_SUBTYPE_CTL_WRAPPER)    
+#define FC_BLOCKACK_REQ FC_KIND(FC_TYPE_CTL, FC_SUBTYPE_BLOCKACK_REQ)   
+#define FC_BLOCKACK     FC_KIND(FC_TYPE_CTL, FC_SUBTYPE_BLOCKACK)       
+#define FC_PS_POLL      FC_KIND(FC_TYPE_CTL, FC_SUBTYPE_PS_POLL)        
+#define FC_RTS          FC_KIND(FC_TYPE_CTL, FC_SUBTYPE_RTS)            
+#define FC_CTS          FC_KIND(FC_TYPE_CTL, FC_SUBTYPE_CTS)            
+#define FC_ACK          FC_KIND(FC_TYPE_CTL, FC_SUBTYPE_ACK)            
+#define FC_CF_END       FC_KIND(FC_TYPE_CTL, FC_SUBTYPE_CF_END)         
+#define FC_CF_END_ACK   FC_KIND(FC_TYPE_CTL, FC_SUBTYPE_CF_END_ACK)     
+#define FC_DATA         FC_KIND(FC_TYPE_DATA, FC_SUBTYPE_DATA)          
+#define FC_NULL_DATA    FC_KIND(FC_TYPE_DATA, FC_SUBTYPE_NULL)          
+#define FC_DATA_CF_ACK  FC_KIND(FC_TYPE_DATA, FC_SUBTYPE_DATA_CF_ACK)   
+#define FC_QOS_DATA     FC_KIND(FC_TYPE_DATA, FC_SUBTYPE_QOS_DATA)      
+#define FC_QOS_NULL     FC_KIND(FC_TYPE_DATA, FC_SUBTYPE_QOS_NULL)      
+#define QOS_PRIO_SHIFT          0       
+#define QOS_PRIO_MASK           0x0007  
+#define QOS_PRIO(qos)           (((qos) & QOS_PRIO_MASK) >> QOS_PRIO_SHIFT)     
+#define QOS_TID_SHIFT           0       
+#define QOS_TID_MASK            0x000f  
+#define QOS_TID(qos)            (((qos) & QOS_TID_MASK) >> QOS_TID_SHIFT)       
+#define QOS_EOSP_SHIFT          4       
+#define QOS_EOSP_MASK           0x0010  
+#define QOS_EOSP(qos)           (((qos) & QOS_EOSP_MASK) >> QOS_EOSP_SHIFT)     
+#define QOS_ACK_NORMAL_ACK      0       
+#define QOS_ACK_NO_ACK          1       
+#define QOS_ACK_NO_EXP_ACK      2       
+#define QOS_ACK_BLOCK_ACK       3       
+#define QOS_ACK_SHIFT           5       
+#define QOS_ACK_MASK            0x0060  
+#define QOS_ACK(qos)            (((qos) & QOS_ACK_MASK) >> QOS_ACK_SHIFT)       
+#define QOS_AMSDU_SHIFT         7       
+#define QOS_AMSDU_MASK          0x0080  
+#define DOT11_MNG_AUTH_ALGO_LEN         2       
+#define DOT11_MNG_AUTH_SEQ_LEN          2       
+#define DOT11_MNG_BEACON_INT_LEN        2       
+#define DOT11_MNG_CAP_LEN               2       
+#define DOT11_MNG_AP_ADDR_LEN           6       
+#define DOT11_MNG_LISTEN_INT_LEN        2       
+#define DOT11_MNG_REASON_LEN            2       
+#define DOT11_MNG_AID_LEN               2       
+#define DOT11_MNG_STATUS_LEN            2       
+#define DOT11_MNG_TIMESTAMP_LEN         8       
+#define DOT11_AID_MASK                  0x3fff  
+#define DOT11_RC_RESERVED               0       
+#define DOT11_RC_UNSPECIFIED            1       
+#define DOT11_RC_AUTH_INVAL             2       
+#define DOT11_RC_DEAUTH_LEAVING         3       
+#define DOT11_RC_INACTIVITY             4       
+#define DOT11_RC_BUSY                   5       
+#define DOT11_RC_INVAL_CLASS_2          6       
+#define DOT11_RC_INVAL_CLASS_3          7       
+#define DOT11_RC_DISASSOC_LEAVING       8       
+#define DOT11_RC_NOT_AUTH               9       
+#define DOT11_RC_BAD_PC                 10      
+#define DOT11_RC_BAD_CHANNELS           11      
+#define DOT11_RC_UNSPECIFIED_QOS        32      
+#define DOT11_RC_INSUFFCIENT_BW         33      
+#define DOT11_RC_EXCESSIVE_FRAMES       34      
+#define DOT11_RC_TX_OUTSIDE_TXOP        35      
+#define DOT11_RC_LEAVING_QBSS           36      
+#define DOT11_RC_BAD_MECHANISM          37      
+#define DOT11_RC_SETUP_NEEDED           38      
+#define DOT11_RC_TIMEOUT                39      
+#define DOT11_RC_MAX                    23      
+#define DOT11_SC_SUCCESS                0       
+#define DOT11_SC_FAILURE                1       
+#define DOT11_SC_CAP_MISMATCH           10      
+#define DOT11_SC_REASSOC_FAIL           11      
+#define DOT11_SC_ASSOC_FAIL             12      
+#define DOT11_SC_AUTH_MISMATCH          13      
+#define DOT11_SC_AUTH_SEQ               14      
+#define DOT11_SC_AUTH_CHALLENGE_FAIL    15      
+#define DOT11_SC_AUTH_TIMEOUT           16      
+#define DOT11_SC_ASSOC_BUSY_FAIL        17      
+#define DOT11_SC_ASSOC_RATE_MISMATCH    18      
+#define DOT11_SC_ASSOC_SHORT_REQUIRED   19      
+#define DOT11_SC_ASSOC_PBCC_REQUIRED    20      
+#define DOT11_SC_ASSOC_AGILITY_REQUIRED 21      
+#define DOT11_SC_ASSOC_SPECTRUM_REQUIRED        22      
+#define DOT11_SC_ASSOC_BAD_POWER_CAP    23      
+#define DOT11_SC_ASSOC_BAD_SUP_CHANNELS 24      
+#define DOT11_SC_ASSOC_SHORTSLOT_REQUIRED       25      
+#define DOT11_SC_ASSOC_ERPBCC_REQUIRED  26      
+#define DOT11_SC_ASSOC_DSSOFDM_REQUIRED 27      
+#define DOT11_SC_DECLINED               37      
+#define DOT11_SC_INVALID_PARAMS         38      
+#define DOT11_MNG_DS_PARAM_LEN                  1       
+#define DOT11_MNG_IBSS_PARAM_LEN                2       
+#define DOT11_MNG_TIM_FIXED_LEN                 3       
+#define DOT11_MNG_TIM_DTIM_COUNT                0       
+#define DOT11_MNG_TIM_DTIM_PERIOD               1       
+#define DOT11_MNG_TIM_BITMAP_CTL                2       
+#define DOT11_MNG_TIM_PVB                       3       
+#define TLV_TAG_OFF             0       
+#define TLV_LEN_OFF             1       
+#define TLV_HDR_LEN             2       
+#define TLV_BODY_OFF            2       
+#define DOT11_MNG_SSID_ID                       0       
+#define DOT11_MNG_RATES_ID                      1       
+#define DOT11_MNG_FH_PARMS_ID                   2       
+#define DOT11_MNG_DS_PARMS_ID                   3       
+#define DOT11_MNG_CF_PARMS_ID                   4       
+#define DOT11_MNG_TIM_ID                        5       
+#define DOT11_MNG_IBSS_PARMS_ID                 6       
+#define DOT11_MNG_COUNTRY_ID                    7       
+#define DOT11_MNG_HOPPING_PARMS_ID              8       
+#define DOT11_MNG_HOPPING_TABLE_ID              9       
+#define DOT11_MNG_REQUEST_ID                    10      
+#define DOT11_MNG_QBSS_LOAD_ID                  11      
+#define DOT11_MNG_EDCA_PARAM_ID                 12      
+#define DOT11_MNG_CHALLENGE_ID                  16      
+#define DOT11_MNG_PWR_CONSTRAINT_ID             32      
+#define DOT11_MNG_PWR_CAP_ID                    33      
+#define DOT11_MNG_TPC_REQUEST_ID                34      
+#define DOT11_MNG_TPC_REPORT_ID                 35      
+#define DOT11_MNG_SUPP_CHANNELS_ID              36      
+#define DOT11_MNG_CHANNEL_SWITCH_ID             37      
+#define DOT11_MNG_MEASURE_REQUEST_ID            38      
+#define DOT11_MNG_MEASURE_REPORT_ID             39      
+#define DOT11_MNG_QUIET_ID                      40      
+#define DOT11_MNG_IBSS_DFS_ID                   41      
+#define DOT11_MNG_ERP_ID                        42      
+#define DOT11_MNG_TS_DELAY_ID                   43      
+#define DOT11_MNG_HT_CAP                        45      
+#define DOT11_MNG_QOS_CAP_ID                    46      
+#define DOT11_MNG_NONERP_ID                     47      
+#define DOT11_MNG_RSN_ID                        48      
+#define DOT11_MNG_EXT_RATES_ID                  50      
+#define DOT11_MNG_REGCLASS_ID                   59      
+#define DOT11_MNG_EXT_CSA_ID                    60      
+#define DOT11_MNG_HT_ADD                        61      
+#define DOT11_MNG_EXT_CHANNEL_OFFSET            62      
+#define DOT11_MNG_WAPI_ID                               68      
+#define DOT11_MNG_HT_BSS_COEXINFO_ID            72      
+#define DOT11_MNG_HT_BSS_CHANNEL_REPORT_ID      73      
+#define DOT11_MNG_HT_OBSS_ID                    74      
+#define DOT11_MNG_EXT_CAP                       127     
+#define DOT11_MNG_WPA_ID                        221     
+#define DOT11_MNG_PROPR_ID                      221     
+#define DOT11_RATE_BASIC                        0x80    
+#define DOT11_RATE_MASK                         0x7F    
+#define DOT11_MNG_ERP_LEN                       1       
+#define DOT11_MNG_NONERP_PRESENT                0x01    
+#define DOT11_MNG_USE_PROTECTION                0x02    
+#define DOT11_MNG_BARKER_PREAMBLE               0x04    
+#define DOT11_MGN_TS_DELAY_LEN          4       
+#define TS_DELAY_FIELD_SIZE                     4       
+#define DOT11_CAP_ESS                           0x0001  
+#define DOT11_CAP_IBSS                          0x0002  
+#define DOT11_CAP_POLLABLE                      0x0004  
+#define DOT11_CAP_POLL_RQ                       0x0008  
+#define DOT11_CAP_PRIVACY                       0x0010  
+#define DOT11_CAP_SHORT                         0x0020  
+#define DOT11_CAP_PBCC                          0x0040  
+#define DOT11_CAP_AGILITY                       0x0080  
+#define DOT11_CAP_SPECTRUM                      0x0100  
+#define DOT11_CAP_SHORTSLOT                     0x0400  
+#define DOT11_CAP_CCK_OFDM                      0x2000  
+#define DOT11_OBSS_COEX_MNG_SUPPORT     0x01    
+#define DOT11_ACTION_HDR_LEN            2       
+#define DOT11_ACTION_CAT_ERR_MASK       0x80    
+#define DOT11_ACTION_CAT_MASK           0x7F    
+#define DOT11_ACTION_CAT_SPECT_MNG      0       
+#define DOT11_ACTION_CAT_BLOCKACK       3       
+#define DOT11_ACTION_CAT_PUBLIC         4       
+#define DOT11_ACTION_CAT_HT             7       
+#define DOT11_ACTION_CAT_VS                     127     
+#define DOT11_ACTION_NOTIFICATION       0x11    
+#define DOT11_ACTION_ID_M_REQ           0       
+#define DOT11_ACTION_ID_M_REP           1       
+#define DOT11_ACTION_ID_TPC_REQ         2       
+#define DOT11_ACTION_ID_TPC_REP         3       
+#define DOT11_ACTION_ID_CHANNEL_SWITCH  4       
+#define DOT11_ACTION_ID_EXT_CSA         5       
+#define DOT11_ACTION_ID_HT_CH_WIDTH     0       
+#define DOT11_ACTION_ID_HT_MIMO_PS      1       
+#define DOT11_PUB_ACTION_BSS_COEX_MNG   0       
+#define DOT11_PUB_ACTION_CHANNEL_SWITCH 4       
+#define DOT11_BA_ACTION_ADDBA_REQ       0       
+#define DOT11_BA_ACTION_ADDBA_RESP      1       
+#define DOT11_BA_ACTION_DELBA           2       
+#define DOT11_ADDBA_PARAM_AMSDU_SUP     0x0001  
+#define DOT11_ADDBA_PARAM_POLICY_MASK   0x0002  
+#define DOT11_ADDBA_PARAM_POLICY_SHIFT  1       
+#define DOT11_ADDBA_PARAM_TID_MASK      0x003c  
+#define DOT11_ADDBA_PARAM_TID_SHIFT     2       
+#define DOT11_ADDBA_PARAM_BSIZE_MASK    0xffc0  
+#define DOT11_ADDBA_PARAM_BSIZE_SHIFT   6       
+#define DOT11_ADDBA_POLICY_DELAYED      0       
+#define DOT11_ADDBA_POLICY_IMMEDIATE    1       
+BWL_PRE_PACKED_STRUCT struct dot11_addba_req {
+        uint8 category;                         
+        uint8 action;                           
+        uint8 token;                            
+        uint16 addba_param_set;                 
+        uint16 timeout;                         
+        uint16 start_seqnum;                    
+} BWL_POST_PACKED_STRUCT;
+typedef struct dot11_addba_req dot11_addba_req_t;
+#define DOT11_ADDBA_REQ_LEN             9       
+BWL_PRE_PACKED_STRUCT struct dot11_addba_resp {
+        uint8 category;                         
+        uint8 action;                           
+        uint8 token;                            
+        uint16 status;                          
+        uint16 addba_param_set;                 
+        uint16 timeout;                         
+} BWL_POST_PACKED_STRUCT;
+typedef struct dot11_addba_resp dot11_addba_resp_t;
+#define DOT11_ADDBA_RESP_LEN            9       
+#define DOT11_DELBA_PARAM_INIT_MASK     0x0800  
+#define DOT11_DELBA_PARAM_INIT_SHIFT    11      
+#define DOT11_DELBA_PARAM_TID_MASK      0xf000  
+#define DOT11_DELBA_PARAM_TID_SHIFT     12      
+BWL_PRE_PACKED_STRUCT struct dot11_delba {
+        uint8 category;                         
+        uint8 action;                           
+        uint16 delba_param_set;                 
+        uint16 reason;                          
+} BWL_POST_PACKED_STRUCT;
+typedef struct dot11_delba dot11_delba_t;
+#define DOT11_DELBA_LEN                 6       
+#define DOT11_BSSTYPE_INFRASTRUCTURE            0       
+#define DOT11_BSSTYPE_INDEPENDENT               1       
+#define DOT11_BSSTYPE_ANY                       2       
+#define DOT11_SCANTYPE_ACTIVE                   0       
+#define DOT11_SCANTYPE_PASSIVE                  1       
+#define PREN_PREAMBLE           24      
+#define PREN_MM_EXT             8       
+#define PREN_PREAMBLE_EXT       4       
+#define NPHY_RIFS_TIME          2       
+#define APHY_SLOT_TIME          9       
+#define APHY_SIFS_TIME          16      
+#define APHY_DIFS_TIME          (APHY_SIFS_TIME + (2 * APHY_SLOT_TIME)) 
+#define APHY_PREAMBLE_TIME      16      
+#define APHY_SIGNAL_TIME        4       
+#define APHY_SYMBOL_TIME        4       
+#define APHY_SERVICE_NBITS      16      
+#define APHY_TAIL_NBITS         6       
+#define APHY_CWMIN              15      
+#define BPHY_SLOT_TIME          20      
+#define BPHY_SIFS_TIME          10      
+#define BPHY_DIFS_TIME          50      
+#define BPHY_PLCP_TIME          192     
+#define BPHY_PLCP_SHORT_TIME    96      
+#define BPHY_CWMIN              31      
+#define DOT11_OFDM_SIGNAL_EXTENSION     6       
+#define PHY_CWMAX               1023    
+#define DOT11_MAXNUMFRAGS       16      
+typedef struct d11cnt {
+        uint32          txfrag;         
+        uint32          txmulti;        
+        uint32          txfail;         
+        uint32          txretry;        
+        uint32          txretrie;       
+        uint32          rxdup;          
+        uint32          txrts;          
+        uint32          txnocts;        
+        uint32          txnoack;        
+        uint32          rxfrag;         
+        uint32          rxmulti;        
+        uint32          rxcrc;          
+        uint32          txfrmsnt;       
+        uint32          rxundec;        
+} d11cnt_t;
+#define BRCM_PROP_OUI           "\x00\x90\x4C"  
+BWL_PRE_PACKED_STRUCT struct brcm_prop_ie_s {
+        uint8 id;               
+        uint8 len;              
+        uint8 oui[3];           
+        uint8 type;             
+        uint16 cap;             
+} BWL_POST_PACKED_STRUCT;
+typedef struct brcm_prop_ie_s brcm_prop_ie_t;
+#define BRCM_PROP_IE_LEN        6       
+#define DPT_IE_TYPE             2
+#define BRCM_OUI                "\x00\x10\x18"  
+BWL_PRE_PACKED_STRUCT struct brcm_ie {
+        uint8   id;             
+        uint8   len;            
+        uint8   oui[3];         
+        uint8   ver;            
+        uint8   assoc;          
+        uint8   flags;          
+        uint8   flags1;         
+        uint16  amsdu_mtu_pref; 
+} BWL_POST_PACKED_STRUCT;
+typedef struct brcm_ie brcm_ie_t;
+#define BRCM_IE_LEN             11      
+#define BRCM_IE_VER             2       
+#define BRCM_IE_LEGACY_AES_VER  1       
+#ifdef WLAFTERBURNER
+#define BRF_ABCAP               0x1     
+#define BRF_ABRQRD              0x2     
+#define BRF_ABCOUNTER_MASK      0xf0    
+#define BRF_ABCOUNTER_SHIFT     4       
+#endif 
+#define BRF_LZWDS               0x4     
+#define BRF_BLOCKACK            0x8     
+#define BRF1_AMSDU              0x1     
+#define BRF1_WMEPS              0x4     
+#define BRF1_PSOFIX             0x8     
+#ifdef WLAFTERBURNER
+#define AB_WDS_TIMEOUT_MAX      15      
+#define AB_WDS_TIMEOUT_MIN      1       
+#endif 
+#define AB_GUARDCOUNT   10              
+#define MCSSET_LEN      16      
+#define MAX_MCS_NUM     (128)   
+BWL_PRE_PACKED_STRUCT struct ht_cap_ie {
+        uint16  cap;
+        uint8   params;
+        uint8   supp_mcs[MCSSET_LEN];
+        uint16  ext_htcap;
+        uint32  txbf_cap;
+        uint8   as_cap;
+} BWL_POST_PACKED_STRUCT;
+typedef struct ht_cap_ie ht_cap_ie_t;
+BWL_PRE_PACKED_STRUCT struct ht_prop_cap_ie {
+        uint8   id;             
+        uint8   len;            
+        uint8   oui[3];         
+        uint8   type;           
+        ht_cap_ie_t cap_ie;
+} BWL_POST_PACKED_STRUCT;
+typedef struct ht_prop_cap_ie ht_prop_cap_ie_t;
+#define HT_PROP_IE_OVERHEAD     4       
+#define HT_CAP_IE_LEN   26
+#define HT_CAP_IE_TYPE  51
+#define HT_CAP_LDPC_CODING      0x0001  
+#define HT_CAP_40MHZ            0x0002  
+#define HT_CAP_MIMO_PS_MASK     0x000C  
+#define HT_CAP_MIMO_PS_SHIFT    0x0002  
+#define HT_CAP_MIMO_PS_OFF      0x0003  
+#define HT_CAP_MIMO_PS_RTS      0x0001  
+#define HT_CAP_MIMO_PS_ON       0x0000  
+#define HT_CAP_GF               0x0010  
+#define HT_CAP_SHORT_GI_20      0x0020  
+#define HT_CAP_SHORT_GI_40      0x0040  
+#define HT_CAP_TX_STBC          0x0080  
+#define HT_CAP_RX_STBC_MASK     0x0300  
+#define HT_CAP_RX_STBC_SHIFT    8       
+#define HT_CAP_DELAYED_BA       0x0400  
+#define HT_CAP_MAX_AMSDU        0x0800  
+#define HT_CAP_DSSS_CCK 0x1000  
+#define HT_CAP_PSMP             0x2000  
+#define HT_CAP_40MHZ_INTOLERANT 0x4000  
+#define HT_CAP_LSIG_TXOP        0x8000  
+#define HT_CAP_RX_STBC_NO               0x0     
+#define HT_CAP_RX_STBC_ONE_STREAM       0x1     
+#define HT_CAP_RX_STBC_TWO_STREAM       0x2     
+#define HT_CAP_RX_STBC_THREE_STREAM     0x3     
+#define HT_MAX_AMSDU            7935    
+#define HT_MIN_AMSDU            3835    
+#define HT_PARAMS_RX_FACTOR_MASK        0x03    
+#define HT_PARAMS_DENSITY_MASK          0x1C    
+#define HT_PARAMS_DENSITY_SHIFT 2       
+#define AMPDU_MAX_MPDU_DENSITY  7       
+#define AMPDU_RX_FACTOR_64K     3       
+#define AMPDU_RX_FACTOR_BASE    8*1024  
+#define AMPDU_DELIMITER_LEN     4       
+#define HT_CAP_EXT_PCO                  0x0001
+#define HT_CAP_EXT_PCO_TTIME_MASK       0x0006
+#define HT_CAP_EXT_PCO_TTIME_SHIFT      1
+#define HT_CAP_EXT_MCS_FEEDBACK_MASK    0x0300
+#define HT_CAP_EXT_MCS_FEEDBACK_SHIFT   8
+#define HT_CAP_EXT_HTC                  0x0400
+#define HT_CAP_EXT_RD_RESP              0x0800
+BWL_PRE_PACKED_STRUCT struct ht_add_ie {
+        uint8   ctl_ch;                 
+        uint8   byte1;                  
+        uint16  opmode;                 
+        uint16  misc_bits;              
+        uint8   basic_mcs[MCSSET_LEN];  
+} BWL_POST_PACKED_STRUCT;
+typedef struct ht_add_ie ht_add_ie_t;
+BWL_PRE_PACKED_STRUCT struct ht_prop_add_ie {
+        uint8   id;             
+        uint8   len;            
+        uint8   oui[3];         
+        uint8   type;           
+        ht_add_ie_t add_ie;
+} BWL_POST_PACKED_STRUCT;
+typedef struct ht_prop_add_ie ht_prop_add_ie_t;
+#define HT_ADD_IE_LEN   22
+#define HT_ADD_IE_TYPE  52
+#define HT_BW_ANY               0x04    
+#define HT_RIFS_PERMITTED       0x08    
+#define HT_OPMODE_MASK          0x0003  
+#define HT_OPMODE_SHIFT 0       
+#define HT_OPMODE_PURE          0x0000  
+#define HT_OPMODE_OPTIONAL      0x0001  
+#define HT_OPMODE_HT20IN40      0x0002  
+#define HT_OPMODE_MIXED 0x0003  
+#define HT_OPMODE_NONGF 0x0004  
+#define DOT11N_TXBURST          0x0008  
+#define DOT11N_OBSS_NONHT       0x0010  
+#define HT_BASIC_STBC_MCS       0x007f  
+#define HT_DUAL_STBC_PROT       0x0080  
+#define HT_SECOND_BCN           0x0100  
+#define HT_LSIG_TXOP            0x0200  
+#define HT_PCO_ACTIVE           0x0400  
+#define HT_PCO_PHASE            0x0800  
+#define HT_DUALCTS_PROTECTION   0x0080  
+#define DOT11N_2G_TXBURST_LIMIT 6160    
+#define DOT11N_5G_TXBURST_LIMIT 3080    
+#define GET_HT_OPMODE(add_ie)           ((ltoh16_ua(&add_ie->opmode) & HT_OPMODE_MASK) \
+                                        >> HT_OPMODE_SHIFT)
+#define HT_MIXEDMODE_PRESENT(add_ie)    ((ltoh16_ua(&add_ie->opmode) & HT_OPMODE_MASK) \
+                                        == HT_OPMODE_MIXED)     
+#define HT_HT20_PRESENT(add_ie) ((ltoh16_ua(&add_ie->opmode) & HT_OPMODE_MASK) \
+                                        == HT_OPMODE_HT20IN40)  
+#define HT_OPTIONAL_PRESENT(add_ie)     ((ltoh16_ua(&add_ie->opmode) & HT_OPMODE_MASK) \
+                                        == HT_OPMODE_OPTIONAL)  
+#define HT_USE_PROTECTION(add_ie)       (HT_HT20_PRESENT((add_ie)) || \
+                                        HT_MIXEDMODE_PRESENT((add_ie))) 
+#define HT_NONGF_PRESENT(add_ie)        ((ltoh16_ua(&add_ie->opmode) & HT_OPMODE_NONGF) \
+                                        == HT_OPMODE_NONGF)     
+#define DOT11N_TXBURST_PRESENT(add_ie)  ((ltoh16_ua(&add_ie->opmode) & DOT11N_TXBURST) \
+                                        == DOT11N_TXBURST)      
+#define DOT11N_OBSS_NONHT_PRESENT(add_ie)       ((ltoh16_ua(&add_ie->opmode) & DOT11N_OBSS_NONHT) \
+                                        == DOT11N_OBSS_NONHT)   
+BWL_PRE_PACKED_STRUCT struct obss_params {
+        uint16  passive_dwell;
+        uint16  active_dwell;
+        uint16  bss_widthscan_interval;
+        uint16  passive_total;
+        uint16  active_total;
+        uint16  chanwidth_transition_dly;
+        uint16  activity_threshold;
+} BWL_POST_PACKED_STRUCT;
+typedef struct obss_params obss_params_t;
+BWL_PRE_PACKED_STRUCT struct dot11_obss_ie {
+        uint8   id;
+        uint8   len;
+        obss_params_t obss_params;
+} BWL_POST_PACKED_STRUCT;
+typedef struct dot11_obss_ie dot11_obss_ie_t;
+#define DOT11_OBSS_SCAN_IE_LEN  sizeof(obss_params_t)   
+BWL_PRE_PACKED_STRUCT struct vndr_ie {
+        uchar id;
+        uchar len;
+        uchar oui [3];
+        uchar data [1];         
+} BWL_POST_PACKED_STRUCT;
+typedef struct vndr_ie vndr_ie_t;
+#define VNDR_IE_HDR_LEN         2       
+#define VNDR_IE_MIN_LEN         3       
+#define VNDR_IE_MAX_LEN         256     
+#define WPA_VERSION             1       
+#define WPA_OUI                 "\x00\x50\xF2"  
+#define WPA2_VERSION            1       
+#define WPA2_VERSION_LEN        2       
+#define WPA2_OUI                "\x00\x0F\xAC"  
+#define WPA_OUI_LEN     3       
+#define RSN_AKM_NONE            0       
+#define RSN_AKM_UNSPECIFIED     1       
+#define RSN_AKM_PSK             2       
+#define DOT11_MAX_DEFAULT_KEYS  4       
+#define DOT11_MAX_KEY_SIZE      32      
+#define DOT11_MAX_IV_SIZE       16      
+#define DOT11_EXT_IV_FLAG       (1<<5)  
+#define DOT11_WPA_KEY_RSC_LEN   8       
+#define WEP1_KEY_SIZE           5       
+#define WEP1_KEY_HEX_SIZE       10      
+#define WEP128_KEY_SIZE         13      
+#define WEP128_KEY_HEX_SIZE     26      
+#define TKIP_MIC_SIZE           8       
+#define TKIP_EOM_SIZE           7       
+#define TKIP_EOM_FLAG           0x5a    
+#define TKIP_KEY_SIZE           32      
+#define TKIP_MIC_AUTH_TX        16      
+#define TKIP_MIC_AUTH_RX        24      
+#define TKIP_MIC_SUP_RX         TKIP_MIC_AUTH_TX        
+#define TKIP_MIC_SUP_TX         TKIP_MIC_AUTH_RX        
+#define AES_KEY_SIZE            16      
+#define AES_MIC_SIZE            8       
+#define SMS4_KEY_LEN            16
+#define SMS4_WPI_CBC_MAC_LEN    16
+#include <packed_section_end.h>
+#endif 
diff --git a/drivers/net/wireless/bcm4329/include/proto/802.11e.h b/drivers/net/wireless/bcm4329/include/proto/802.11e.h
new file mode 100644
index 00000000000..1dd6f45b1ed
--- /dev/null
+++ b/drivers/net/wireless/bcm4329/include/proto/802.11e.h
@@ -0,0 +1,131 @@
+/*
+ * 802.11e protocol header file
+ *
+ * Copyright (C) 1999-2010, Broadcom Corporation
+ * 
+ *      Unless you and Broadcom execute a separate written software license
+ * agreement governing use of this software, this software is licensed to you
+ * under the terms of the GNU General Public License version 2 (the "GPL"),
+ * available at http://www.broadcom.com/licenses/GPLv2.php, with the
+ * following added to such license:
+ * 
+ *      As a special exception, the copyright holders of this software give you
+ * permission to link this software with independent modules, and to copy and
+ * distribute the resulting executable under terms of your choice, provided that
+ * you also meet, for each linked independent module, the terms and conditions of
+ * the license of that module.  An independent module is a module which is not
+ * derived from this software.  The special exception does not apply to any
+ * modifications of the software.
+ * 
+ *      Notwithstanding the above, under no circumstances may you combine this
+ * software in any way with any other Broadcom software provided under a license
+ * other than the GPL, without Broadcom's express prior written consent.
+ *
+ * $Id: 802.11e.h,v 1.5.56.1 2008/11/20 00:51:18 Exp $
+ */
+#ifndef _802_11e_H_
+#define _802_11e_H_
+#ifndef _TYPEDEFS_H_
+#include <typedefs.h>
+#endif
+/* This marks the start of a packed structure section. */
+#include <packed_section_start.h>
+/* WME Traffic Specification (TSPEC) element */
+#define WME_TSPEC_HDR_LEN           2           /* WME TSPEC header length */
+#define WME_TSPEC_BODY_OFF          2           /* WME TSPEC body offset */
+#define WME_CATEGORY_CODE_OFFSET        0               /* WME Category code offset */
+#define WME_ACTION_CODE_OFFSET          1               /* WME Action code offset */
+#define WME_TOKEN_CODE_OFFSET           2               /* WME Token code offset */
+#define WME_STATUS_CODE_OFFSET          3               /* WME Status code offset */
+BWL_PRE_PACKED_STRUCT struct tsinfo {
+        uint8 octets[3];
+} BWL_POST_PACKED_STRUCT;
+typedef struct tsinfo tsinfo_t;
+/* 802.11e TSPEC IE */
+typedef BWL_PRE_PACKED_STRUCT struct tspec {
+        uint8 oui[DOT11_OUI_LEN];       /* WME_OUI */
+        uint8 type;                                     /* WME_TYPE */
+        uint8 subtype;                          /* WME_SUBTYPE_TSPEC */
+        uint8 version;                          /* WME_VERSION */
+        tsinfo_t tsinfo;                        /* TS Info bit field */
+        uint16 nom_msdu_size;           /* (Nominal or fixed) MSDU Size (bytes) */
+        uint16 max_msdu_size;           /* Maximum MSDU Size (bytes) */
+        uint32 min_srv_interval;        /* Minimum Service Interval (us) */
+        uint32 max_srv_interval;        /* Maximum Service Interval (us) */
+        uint32 inactivity_interval;     /* Inactivity Interval (us) */
+        uint32 suspension_interval; /* Suspension Interval (us) */
+        uint32 srv_start_time;          /* Service Start Time (us) */
+        uint32 min_data_rate;           /* Minimum Data Rate (bps) */
+        uint32 mean_data_rate;          /* Mean Data Rate (bps) */
+        uint32 peak_data_rate;          /* Peak Data Rate (bps) */
+        uint32 max_burst_size;          /* Maximum Burst Size (bytes) */
+        uint32 delay_bound;                     /* Delay Bound (us) */
+        uint32 min_phy_rate;            /* Minimum PHY Rate (bps) */
+        uint16 surplus_bw;                      /* Surplus Bandwidth Allowance (range 1.0-8.0) */
+        uint16 medium_time;                     /* Medium Time (32 us/s periods) */
+} BWL_POST_PACKED_STRUCT tspec_t;
+#define WME_TSPEC_LEN   (sizeof(tspec_t))               /* not including 2-bytes of header */
+/* ts_info */
+/* 802.1D priority is duplicated - bits 13-11 AND bits 3-1 */
+#define TS_INFO_TID_SHIFT               1       /* TS info. TID shift */
+#define TS_INFO_TID_MASK                (0xf << TS_INFO_TID_SHIFT)      /* TS info. TID mask */
+#define TS_INFO_CONTENTION_SHIFT        7       /* TS info. contention shift */
+#define TS_INFO_CONTENTION_MASK (0x1 << TS_INFO_CONTENTION_SHIFT) /* TS info. contention mask */
+#define TS_INFO_DIRECTION_SHIFT 5       /* TS info. direction shift */
+#define TS_INFO_DIRECTION_MASK  (0x3 << TS_INFO_DIRECTION_SHIFT) /* TS info. direction mask */
+#define TS_INFO_PSB_SHIFT               2               /* TS info. PSB bit Shift */
+#define TS_INFO_PSB_MASK                (1 << TS_INFO_PSB_SHIFT)        /* TS info. PSB mask */
+#define TS_INFO_UPLINK                  (0 << TS_INFO_DIRECTION_SHIFT)  /* TS info. uplink */
+#define TS_INFO_DOWNLINK                (1 << TS_INFO_DIRECTION_SHIFT)  /* TS info. downlink */
+#define TS_INFO_BIDIRECTIONAL   (3 << TS_INFO_DIRECTION_SHIFT)  /* TS info. bidirectional */
+#define TS_INFO_USER_PRIO_SHIFT 3       /* TS info. user priority shift */
+/* TS info. user priority mask */
+#define TS_INFO_USER_PRIO_MASK  (0x7 << TS_INFO_USER_PRIO_SHIFT)
+/* Macro to get/set bit(s) field in TSINFO */
+#define WLC_CAC_GET_TID(pt)     ((((pt).octets[0]) & TS_INFO_TID_MASK) >> TS_INFO_TID_SHIFT)
+#define WLC_CAC_GET_DIR(pt)     ((((pt).octets[0]) & \
+        TS_INFO_DIRECTION_MASK) >> TS_INFO_DIRECTION_SHIFT)
+#define WLC_CAC_GET_PSB(pt)     ((((pt).octets[1]) & TS_INFO_PSB_MASK) >> TS_INFO_PSB_SHIFT)
+#define WLC_CAC_GET_USER_PRIO(pt)       ((((pt).octets[1]) & \
+        TS_INFO_USER_PRIO_MASK) >> TS_INFO_USER_PRIO_SHIFT)
+#define WLC_CAC_SET_TID(pt, id) ((((pt).octets[0]) & (~TS_INFO_TID_MASK)) | \
+        ((id) << TS_INFO_TID_SHIFT))
+#define WLC_CAC_SET_USER_PRIO(pt, prio) ((((pt).octets[0]) & (~TS_INFO_USER_PRIO_MASK)) | \
+        ((prio) << TS_INFO_USER_PRIO_SHIFT))
+/* 802.11e QBSS Load IE */
+#define QBSS_LOAD_IE_LEN                5       /* QBSS Load IE length */
+#define QBSS_LOAD_AAC_OFF               3       /* AAC offset in IE */
+#define CAC_ADDTS_RESP_TIMEOUT          300     /* default ADDTS response timeout in ms */
+/* 802.11e ADDTS status code */
+#define DOT11E_STATUS_ADMISSION_ACCEPTED        0       /* TSPEC Admission accepted status */
+#define DOT11E_STATUS_ADDTS_INVALID_PARAM       1       /* TSPEC invalid parameter status */
+#define DOT11E_STATUS_ADDTS_REFUSED_NSBW        3       /* ADDTS refused (non-sufficient BW) */
+#define DOT11E_STATUS_ADDTS_REFUSED_AWHILE      47      /* ADDTS refused but could retry later */
+/* 802.11e DELTS status code */
+#define DOT11E_STATUS_QSTA_LEAVE_QBSS           36      /* STA leave QBSS */
+#define DOT11E_STATUS_END_TS                            37      /* END TS */
+#define DOT11E_STATUS_UNKNOWN_TS                        38      /* UNKNOWN TS */
+#define DOT11E_STATUS_QSTA_REQ_TIMEOUT          39      /* STA ADDTS request timeout */
+/* This marks the end of a packed structure section. */
+#include <packed_section_end.h>
+#endif /* _802_11e_CAC_H_ */
diff --git a/drivers/net/wireless/bcm4329/include/proto/802.1d.h b/drivers/net/wireless/bcm4329/include/proto/802.1d.h
new file mode 100644
index 00000000000..45c728bc297
--- /dev/null
+++ b/drivers/net/wireless/bcm4329/include/proto/802.1d.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 1999-2010, Broadcom Corporation
+ * 
+ *      Unless you and Broadcom execute a separate written software license
+ * agreement governing use of this software, this software is licensed to you
+ * under the terms of the GNU General Public License version 2 (the "GPL"),
+ * available at http://www.broadcom.com/licenses/GPLv2.php, with the
+ * following added to such license:
+ * 
+ *      As a special exception, the copyright holders of this software give you
+ * permission to link this software with independent modules, and to copy and
+ * distribute the resulting executable under terms of your choice, provided that
+ * you also meet, for each linked independent module, the terms and conditions of
+ * the license of that module.  An independent module is a module which is not
+ * derived from this software.  The special exception does not apply to any
+ * modifications of the software.
+ * 
+ *      Notwithstanding the above, under no circumstances may you combine this
+ * software in any way with any other Broadcom software provided under a license
+ * other than the GPL, without Broadcom's express prior written consent.
+ *
+ * Fundamental types and constants relating to 802.1D
+ *
+ * $Id: 802.1d.h,v 9.3 2007/04/10 21:33:06 Exp $
+ */
+#ifndef _802_1_D_
+#define _802_1_D_
+#define PRIO_8021D_NONE         2       
+#define PRIO_8021D_BK           1       
+#define PRIO_8021D_BE           0       
+#define PRIO_8021D_EE           3       
+#define PRIO_8021D_CL           4       
+#define PRIO_8021D_VI           5       
+#define PRIO_8021D_VO           6       
+#define PRIO_8021D_NC           7       
+#define MAXPRIO                 7       
+#define NUMPRIO                 (MAXPRIO + 1)
+#define ALLPRIO         -1      
+#define PRIO2PREC(prio) \
+        (((prio) == PRIO_8021D_NONE || (prio) == PRIO_8021D_BE) ? ((prio^2)) : (prio))
+#endif 
diff --git a/drivers/net/wireless/bcm4329/include/proto/bcmeth.h b/drivers/net/wireless/bcm4329/include/proto/bcmeth.h
new file mode 100644
index 00000000000..fdb5a2a5648
--- /dev/null
+++ b/drivers/net/wireless/bcm4329/include/proto/bcmeth.h
@@ -0,0 +1,83 @@
+/*
+ * Broadcom Ethernettype  protocol definitions
+ *
+ * Copyright (C) 1999-2010, Broadcom Corporation
+ * 
+ *      Unless you and Broadcom execute a separate written software license
+ * agreement governing use of this software, this software is licensed to you
+ * under the terms of the GNU General Public License version 2 (the "GPL"),
+ * available at http://www.broadcom.com/licenses/GPLv2.php, with the
+ * following added to such license:
+ * 
+ *      As a special exception, the copyright holders of this software give you
+ * permission to link this software with independent modules, and to copy and
+ * distribute the resulting executable under terms of your choice, provided that
+ * you also meet, for each linked independent module, the terms and conditions of
+ * the license of that module.  An independent module is a module which is not
+ * derived from this software.  The special exception does not apply to any
+ * modifications of the software.
+ * 
+ *      Notwithstanding the above, under no circumstances may you combine this
+ * software in any way with any other Broadcom software provided under a license
+ * other than the GPL, without Broadcom's express prior written consent.
+ *
+ * $Id: bcmeth.h,v 9.9.46.1 2008/11/20 00:51:20 Exp $
+ */
+#ifndef _BCMETH_H_
+#define _BCMETH_H_
+#ifndef _TYPEDEFS_H_
+#include <typedefs.h>
+#endif
+#include <packed_section_start.h>
+#define BCMILCP_SUBTYPE_RATE            1
+#define BCMILCP_SUBTYPE_LINK            2
+#define BCMILCP_SUBTYPE_CSA             3
+#define BCMILCP_SUBTYPE_LARQ            4
+#define BCMILCP_SUBTYPE_VENDOR          5
+#define BCMILCP_SUBTYPE_FLH             17
+#define BCMILCP_SUBTYPE_VENDOR_LONG     32769
+#define BCMILCP_SUBTYPE_CERT            32770
+#define BCMILCP_SUBTYPE_SES             32771
+#define BCMILCP_BCM_SUBTYPE_RESERVED            0
+#define BCMILCP_BCM_SUBTYPE_EVENT               1
+#define BCMILCP_BCM_SUBTYPE_SES                 2
+#define BCMILCP_BCM_SUBTYPE_DPT                 4
+#define BCMILCP_BCM_SUBTYPEHDR_MINLENGTH        8
+#define BCMILCP_BCM_SUBTYPEHDR_VERSION          0
+typedef BWL_PRE_PACKED_STRUCT struct bcmeth_hdr
+{
+        uint16  subtype;        
+        uint16  length;
+        uint8   version;        
+        uint8   oui[3];         
+        
+        uint16  usr_subtype;
+} BWL_POST_PACKED_STRUCT bcmeth_hdr_t;
+#include <packed_section_end.h>
+#endif  
diff --git a/drivers/net/wireless/bcm4329/include/proto/bcmevent.h b/drivers/net/wireless/bcm4329/include/proto/bcmevent.h
new file mode 100644
index 00000000000..1f8ecb14d97
--- /dev/null
+++ b/drivers/net/wireless/bcm4329/include/proto/bcmevent.h
@@ -0,0 +1,212 @@
+/*
+ * Broadcom Event  protocol definitions
+ *
+ * Copyright (C) 1999-2010, Broadcom Corporation
+ * 
+ *      Unless you and Broadcom execute a separate written software license
+ * agreement governing use of this software, this software is licensed to you
+ * under the terms of the GNU General Public License version 2 (the "GPL"),
+ * available at http://www.broadcom.com/licenses/GPLv2.php, with the
+ * following added to such license:
+ * 
+ *      As a special exception, the copyright holders of this software give you
+ * permission to link this software with independent modules, and to copy and
+ * distribute the resulting executable under terms of your choice, provided that
+ * you also meet, for each linked independent module, the terms and conditions of
+ * the license of that module.  An independent module is a module which is not
+ * derived from this software.  The special exception does not apply to any
+ * modifications of the software.
+ * 
+ *      Notwithstanding the above, under no circumstances may you combine this
+ * software in any way with any other Broadcom software provided under a license
+ * other than the GPL, without Broadcom's express prior written consent.
+ *
+ *
+ * Dependencies: proto/bcmeth.h
+ *
+ * $Id: bcmevent.h,v 9.34.4.1.20.16.64.1 2010/11/08 21:57:03 Exp $
+ *
+ */
+#ifndef _BCMEVENT_H_
+#define _BCMEVENT_H_
+#ifndef _TYPEDEFS_H_
+#include <typedefs.h>
+#endif
+#include <packed_section_start.h>
+#define BCM_EVENT_MSG_VERSION           1       
+#define BCM_MSG_IFNAME_MAX              16      
+#define WLC_EVENT_MSG_LINK              0x01    
+#define WLC_EVENT_MSG_FLUSHTXQ          0x02    
+#define WLC_EVENT_MSG_GROUP             0x04    
+typedef BWL_PRE_PACKED_STRUCT struct
+{
+        uint16  version;
+        uint16  flags;                  
+        uint32  event_type;             
+        uint32  status;                 
+        uint32  reason;                 
+        uint32  auth_type;              
+        uint32  datalen;                
+        struct ether_addr       addr;   
+        char    ifname[BCM_MSG_IFNAME_MAX]; 
+} BWL_POST_PACKED_STRUCT wl_event_msg_t;
+typedef BWL_PRE_PACKED_STRUCT struct bcm_event {
+        struct ether_header eth;
+        bcmeth_hdr_t            bcm_hdr;
+        wl_event_msg_t          event;
+        
+} BWL_POST_PACKED_STRUCT bcm_event_t;
+#define BCM_MSG_LEN     (sizeof(bcm_event_t) - sizeof(bcmeth_hdr_t) - sizeof(struct ether_header))
+#define WLC_E_SET_SSID          0       
+#define WLC_E_JOIN              1       
+#define WLC_E_START             2       
+#define WLC_E_AUTH              3       
+#define WLC_E_AUTH_IND          4       
+#define WLC_E_DEAUTH            5       
+#define WLC_E_DEAUTH_IND        6       
+#define WLC_E_ASSOC             7       
+#define WLC_E_ASSOC_IND         8       
+#define WLC_E_REASSOC           9       
+#define WLC_E_REASSOC_IND       10      
+#define WLC_E_DISASSOC          11      
+#define WLC_E_DISASSOC_IND      12      
+#define WLC_E_QUIET_START       13      
+#define WLC_E_QUIET_END         14      
+#define WLC_E_BEACON_RX         15      
+#define WLC_E_LINK              16      
+#define WLC_E_MIC_ERROR         17      
+#define WLC_E_NDIS_LINK         18      
+#define WLC_E_ROAM              19      
+#define WLC_E_TXFAIL            20      
+#define WLC_E_PMKID_CACHE       21      
+#define WLC_E_RETROGRADE_TSF    22      
+#define WLC_E_PRUNE             23      
+#define WLC_E_AUTOAUTH          24      
+#define WLC_E_EAPOL_MSG         25      
+#define WLC_E_SCAN_COMPLETE     26      
+#define WLC_E_ADDTS_IND         27      
+#define WLC_E_DELTS_IND         28      
+#define WLC_E_BCNSENT_IND       29      
+#define WLC_E_BCNRX_MSG         30      
+#define WLC_E_BCNLOST_MSG       31      
+#define WLC_E_ROAM_PREP         32      
+#define WLC_E_PFN_NET_FOUND     33      
+#define WLC_E_PFN_NET_LOST      34      
+#define WLC_E_RESET_COMPLETE    35
+#define WLC_E_JOIN_START        36
+#define WLC_E_ROAM_START        37
+#define WLC_E_ASSOC_START       38
+#define WLC_E_IBSS_ASSOC        39
+#define WLC_E_RADIO             40
+#define WLC_E_PSM_WATCHDOG      41      
+#define WLC_E_PROBREQ_MSG       44      
+#define WLC_E_SCAN_CONFIRM_IND  45
+#define WLC_E_PSK_SUP   46      
+#define WLC_E_COUNTRY_CODE_CHANGED 47
+#define WLC_E_EXCEEDED_MEDIUM_TIME 48   
+#define WLC_E_ICV_ERROR         49      
+#define WLC_E_UNICAST_DECODE_ERROR 50 
+#define WLC_E_MULTICAST_DECODE_ERROR 51 
+#define WLC_E_TRACE 52
+#define WLC_E_IF                54      
+#define WLC_E_RSSI              56      
+#define WLC_E_PFN_SCAN_COMPLETE 57      
+#define WLC_E_ACTION_FRAME      58      
+#define WLC_E_ACTION_FRAME_COMPLETE 59  
+#define WLC_E_ESCAN_RESULT      69
+#define WLC_E_WAKE_EVENT        70
+#define WLC_E_RELOAD            71
+#define WLC_E_LAST              72
+#define WLC_E_STATUS_SUCCESS            0       
+#define WLC_E_STATUS_FAIL               1       
+#define WLC_E_STATUS_TIMEOUT            2       
+#define WLC_E_STATUS_NO_NETWORKS        3       
+#define WLC_E_STATUS_ABORT              4       
+#define WLC_E_STATUS_NO_ACK             5       
+#define WLC_E_STATUS_UNSOLICITED        6       
+#define WLC_E_STATUS_ATTEMPT            7       
+#define WLC_E_STATUS_PARTIAL            8       
+#define WLC_E_STATUS_NEWSCAN    9       
+#define WLC_E_STATUS_NEWASSOC   10      
+#define WLC_E_STATUS_11HQUIET   11      
+#define WLC_E_STATUS_SUPPRESS   12      
+#define WLC_E_STATUS_NOCHANS    13      
+#define WLC_E_STATUS_CCXFASTRM  14      
+#define WLC_E_STATUS_CS_ABORT   15      
+#define WLC_E_REASON_INITIAL_ASSOC      0       
+#define WLC_E_REASON_LOW_RSSI           1       
+#define WLC_E_REASON_DEAUTH             2       
+#define WLC_E_REASON_DISASSOC           3       
+#define WLC_E_REASON_BCNS_LOST          4       
+#define WLC_E_REASON_FAST_ROAM_FAILED   5       
+#define WLC_E_REASON_DIRECTED_ROAM      6       
+#define WLC_E_REASON_TSPEC_REJECTED     7       
+#define WLC_E_REASON_BETTER_AP          8       
+#define WLC_E_PRUNE_ENCR_MISMATCH       1       
+#define WLC_E_PRUNE_BCAST_BSSID         2       
+#define WLC_E_PRUNE_MAC_DENY            3       
+#define WLC_E_PRUNE_MAC_NA              4       
+#define WLC_E_PRUNE_REG_PASSV           5       
+#define WLC_E_PRUNE_SPCT_MGMT           6       
+#define WLC_E_PRUNE_RADAR               7       
+#define WLC_E_RSN_MISMATCH              8       
+#define WLC_E_PRUNE_NO_COMMON_RATES     9       
+#define WLC_E_PRUNE_BASIC_RATES         10      
+#define WLC_E_PRUNE_CIPHER_NA           12      
+#define WLC_E_PRUNE_KNOWN_STA           13      
+#define WLC_E_PRUNE_WDS_PEER            15      
+#define WLC_E_PRUNE_QBSS_LOAD           16      
+#define WLC_E_PRUNE_HOME_AP             17      
+#define WLC_E_SUP_OTHER                         0       
+#define WLC_E_SUP_DECRYPT_KEY_DATA      1       
+#define WLC_E_SUP_BAD_UCAST_WEP128      2       
+#define WLC_E_SUP_BAD_UCAST_WEP40       3       
+#define WLC_E_SUP_UNSUP_KEY_LEN         4       
+#define WLC_E_SUP_PW_KEY_CIPHER         5       
+#define WLC_E_SUP_MSG3_TOO_MANY_IE      6       
+#define WLC_E_SUP_MSG3_IE_MISMATCH      7       
+#define WLC_E_SUP_NO_INSTALL_FLAG       8       
+#define WLC_E_SUP_MSG3_NO_GTK           9       
+#define WLC_E_SUP_GRP_KEY_CIPHER        10      
+#define WLC_E_SUP_GRP_MSG1_NO_GTK       11      
+#define WLC_E_SUP_GTK_DECRYPT_FAIL      12      
+#define WLC_E_SUP_SEND_FAIL                     13      
+#define WLC_E_SUP_DEAUTH                        14      
+#define WLC_E_SUP_WPA_PSK_TMO       15  
+#define WLC_E_IF_ADD            1       
+#define WLC_E_IF_DEL            2       
+#define WLC_E_RELOAD_STATUS1    1
+#include <packed_section_end.h>
+#endif 
diff --git a/drivers/net/wireless/bcm4329/include/proto/bcmip.h b/drivers/net/wireless/bcm4329/include/proto/bcmip.h
new file mode 100644
index 00000000000..9d2fd6fba48
--- /dev/null
+++ b/drivers/net/wireless/bcm4329/include/proto/bcmip.h
@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 1999-2010, Broadcom Corporation
+ * 
+ *      Unless you and Broadcom execute a separate written software license
+ * agreement governing use of this software, this software is licensed to you
+ * under the terms of the GNU General Public License version 2 (the "GPL"),
+ * available at http://www.broadcom.com/licenses/GPLv2.php, with the
+ * following added to such license:
+ * 
+ *      As a special exception, the copyright holders of this software give you
+ * permission to link this software with independent modules, and to copy and
+ * distribute the resulting executable under terms of your choice, provided that
+ * you also meet, for each linked independent module, the terms and conditions of
+ * the license of that module.  An independent module is a module which is not
+ * derived from this software.  The special exception does not apply to any
+ * modifications of the software.
+ * 
+ *      Notwithstanding the above, under no circumstances may you combine this
+ * software in any way with any other Broadcom software provided under a license
+ * other than the GPL, without Broadcom's express prior written consent.
+ *
+ * Fundamental constants relating to IP Protocol
+ *
+ * $Id: bcmip.h,v 9.16.186.4 2009/01/27 04:25:25 Exp $
+ */
+#ifndef _bcmip_h_
+#define _bcmip_h_
+#ifndef _TYPEDEFS_H_
+#include <typedefs.h>
+#endif
+#include <packed_section_start.h>
+#define IP_VER_OFFSET           0x0     
+#define IP_VER_MASK             0xf0    
+#define IP_VER_SHIFT            4       
+#define IP_VER_4                4       
+#define IP_VER_6                6       
+#define IP_VER(ip_body) \
+        ((((uint8 *)(ip_body))[IP_VER_OFFSET] & IP_VER_MASK) >> IP_VER_SHIFT)
+#define IP_PROT_ICMP            0x1     
+#define IP_PROT_TCP             0x6     
+#define IP_PROT_UDP             0x11    
+#define IPV4_VER_HL_OFFSET      0       
+#define IPV4_TOS_OFFSET         1       
+#define IPV4_PKTLEN_OFFSET      2       
+#define IPV4_PKTFLAG_OFFSET     6       
+#define IPV4_PROT_OFFSET        9       
+#define IPV4_CHKSUM_OFFSET      10      
+#define IPV4_SRC_IP_OFFSET      12      
+#define IPV4_DEST_IP_OFFSET     16      
+#define IPV4_OPTIONS_OFFSET     20      
+#define IPV4_VER_MASK           0xf0    
+#define IPV4_VER_SHIFT          4       
+#define IPV4_HLEN_MASK          0x0f    
+#define IPV4_HLEN(ipv4_body)    (4 * (((uint8 *)(ipv4_body))[IPV4_VER_HL_OFFSET] & IPV4_HLEN_MASK))
+#define IPV4_ADDR_LEN           4       
+#define IPV4_ADDR_NULL(a)       ((((uint8 *)(a))[0] | ((uint8 *)(a))[1] | \
+                                  ((uint8 *)(a))[2] | ((uint8 *)(a))[3]) == 0)
+#define IPV4_ADDR_BCAST(a)      ((((uint8 *)(a))[0] & ((uint8 *)(a))[1] & \
+                                  ((uint8 *)(a))[2] & ((uint8 *)(a))[3]) == 0xff)
+#define IPV4_TOS_DSCP_MASK      0xfc    
+#define IPV4_TOS_DSCP_SHIFT     2       
+#define IPV4_TOS(ipv4_body)     (((uint8 *)(ipv4_body))[IPV4_TOS_OFFSET])
+#define IPV4_TOS_PREC_MASK      0xe0    
+#define IPV4_TOS_PREC_SHIFT     5       
+#define IPV4_TOS_LOWDELAY       0x10    
+#define IPV4_TOS_THROUGHPUT     0x8     
+#define IPV4_TOS_RELIABILITY    0x4     
+#define IPV4_PROT(ipv4_body)    (((uint8 *)(ipv4_body))[IPV4_PROT_OFFSET])
+#define IPV4_FRAG_RESV          0x8000  
+#define IPV4_FRAG_DONT          0x4000  
+#define IPV4_FRAG_MORE          0x2000  
+#define IPV4_FRAG_OFFSET_MASK   0x1fff  
+#define IPV4_ADDR_STR_LEN       16      
+BWL_PRE_PACKED_STRUCT struct ipv4_addr {
+        uint8   addr[IPV4_ADDR_LEN];
+} BWL_POST_PACKED_STRUCT;
+BWL_PRE_PACKED_STRUCT struct ipv4_hdr {
+        uint8   version_ihl;            
+        uint8   tos;                    
+        uint16  tot_len;                
+        uint16  id;
+        uint16  frag;                   
+        uint8   ttl;                    
+        uint8   prot;                   
+        uint16  hdr_chksum;             
+        uint8   src_ip[IPV4_ADDR_LEN];  
+        uint8   dst_ip[IPV4_ADDR_LEN];  
+} BWL_POST_PACKED_STRUCT;
+#define IPV6_PAYLOAD_LEN_OFFSET 4       
+#define IPV6_NEXT_HDR_OFFSET    6       
+#define IPV6_HOP_LIMIT_OFFSET   7       
+#define IPV6_SRC_IP_OFFSET      8       
+#define IPV6_DEST_IP_OFFSET     24      
+#define IPV6_TRAFFIC_CLASS(ipv6_body) \
+        (((((uint8 *)(ipv6_body))[0] & 0x0f) << 4) | \
+         ((((uint8 *)(ipv6_body))[1] & 0xf0) >> 4))
+#define IPV6_FLOW_LABEL(ipv6_body) \
+        (((((uint8 *)(ipv6_body))[1] & 0x0f) << 16) | \
+         (((uint8 *)(ipv6_body))[2] << 8) | \
+         (((uint8 *)(ipv6_body))[3]))
+#define IPV6_PAYLOAD_LEN(ipv6_body) \
+        ((((uint8 *)(ipv6_body))[IPV6_PAYLOAD_LEN_OFFSET + 0] << 8) | \
+         ((uint8 *)(ipv6_body))[IPV6_PAYLOAD_LEN_OFFSET + 1])
+#define IPV6_NEXT_HDR(ipv6_body) \
+        (((uint8 *)(ipv6_body))[IPV6_NEXT_HDR_OFFSET])
+#define IPV6_PROT(ipv6_body)    IPV6_NEXT_HDR(ipv6_body)
+#define IPV6_ADDR_LEN           16      
+#ifndef IP_TOS
+#define IP_TOS(ip_body) \
+        (IP_VER(ip_body) == IP_VER_4 ? IPV4_TOS(ip_body) : \
+         IP_VER(ip_body) == IP_VER_6 ? IPV6_TRAFFIC_CLASS(ip_body) : 0)
+#endif
+#include <packed_section_end.h>
+#endif  
diff --git a/drivers/net/wireless/bcm4329/include/proto/eapol.h b/drivers/net/wireless/bcm4329/include/proto/eapol.h
new file mode 100644
index 00000000000..95e76ff18c6
--- /dev/null
+++ b/drivers/net/wireless/bcm4329/include/proto/eapol.h
@@ -0,0 +1,172 @@
+/*
+ * 802.1x EAPOL definitions
+ *
+ * See
+ * IEEE Std 802.1X-2001
+ * IEEE 802.1X RADIUS Usage Guidelines
+ *
+ * Copyright (C) 2002 Broadcom Corporation
+ *
+ * $Id: eapol.h,v 9.18.260.1.2.1.6.6 2009/04/08 05:00:08 Exp $
+ */
+#ifndef _eapol_h_
+#define _eapol_h_
+#ifndef _TYPEDEFS_H_
+#include <typedefs.h>
+#endif
+/* This marks the start of a packed structure section. */
+#include <packed_section_start.h>
+#define AKW_BLOCK_LEN   8       /* The only def we need here */
+/* EAPOL for 802.3/Ethernet */
+typedef struct {
+        struct ether_header eth;        /* 802.3/Ethernet header */
+        unsigned char version;          /* EAPOL protocol version */
+        unsigned char type;             /* EAPOL type */
+        unsigned short length;          /* Length of body */
+        unsigned char body[1];          /* Body (optional) */
+} eapol_header_t;
+#define EAPOL_HEADER_LEN 18
+/* EAPOL version */
+#define WPA2_EAPOL_VERSION      2
+#define WPA_EAPOL_VERSION       1
+#define LEAP_EAPOL_VERSION      1
+#define SES_EAPOL_VERSION       1
+/* EAPOL types */
+#define EAP_PACKET              0
+#define EAPOL_START             1
+#define EAPOL_LOGOFF            2
+#define EAPOL_KEY               3
+#define EAPOL_ASF               4
+/* EAPOL-Key types */
+#define EAPOL_RC4_KEY           1
+#define EAPOL_WPA2_KEY          2       /* 802.11i/WPA2 */
+#define EAPOL_WPA_KEY           254     /* WPA */
+/* RC4 EAPOL-Key header field sizes */
+#define EAPOL_KEY_REPLAY_LEN    8
+#define EAPOL_KEY_IV_LEN        16
+#define EAPOL_KEY_SIG_LEN       16
+/* RC4 EAPOL-Key */
+typedef BWL_PRE_PACKED_STRUCT struct {
+        unsigned char type;                     /* Key Descriptor Type */
+        unsigned short length;                  /* Key Length (unaligned) */
+        unsigned char replay[EAPOL_KEY_REPLAY_LEN];     /* Replay Counter */
+        unsigned char iv[EAPOL_KEY_IV_LEN];             /* Key IV */
+        unsigned char index;                            /* Key Flags & Index */
+        unsigned char signature[EAPOL_KEY_SIG_LEN];     /* Key Signature */
+        unsigned char key[1];                           /* Key (optional) */
+} BWL_POST_PACKED_STRUCT eapol_key_header_t;
+#define EAPOL_KEY_HEADER_LEN    44
+/* RC4 EAPOL-Key flags */
+#define EAPOL_KEY_FLAGS_MASK    0x80
+#define EAPOL_KEY_BROADCAST     0
+#define EAPOL_KEY_UNICAST       0x80
+/* RC4 EAPOL-Key index */
+#define EAPOL_KEY_INDEX_MASK    0x7f
+/* WPA/802.11i/WPA2 EAPOL-Key header field sizes */
+#define EAPOL_WPA_KEY_REPLAY_LEN        8
+#define EAPOL_WPA_KEY_NONCE_LEN         32
+#define EAPOL_WPA_KEY_IV_LEN            16
+#define EAPOL_WPA_KEY_ID_LEN            8
+#define EAPOL_WPA_KEY_RSC_LEN           8
+#define EAPOL_WPA_KEY_MIC_LEN           16
+#define EAPOL_WPA_KEY_DATA_LEN          (EAPOL_WPA_MAX_KEY_SIZE + AKW_BLOCK_LEN)
+#define EAPOL_WPA_MAX_KEY_SIZE          32
+/* WPA EAPOL-Key */
+typedef BWL_PRE_PACKED_STRUCT struct {
+        unsigned char type;             /* Key Descriptor Type */
+        unsigned short key_info;        /* Key Information (unaligned) */
+        unsigned short key_len;         /* Key Length (unaligned) */
+        unsigned char replay[EAPOL_WPA_KEY_REPLAY_LEN]; /* Replay Counter */
+        unsigned char nonce[EAPOL_WPA_KEY_NONCE_LEN];   /* Nonce */
+        unsigned char iv[EAPOL_WPA_KEY_IV_LEN];         /* Key IV */
+        unsigned char rsc[EAPOL_WPA_KEY_RSC_LEN];       /* Key RSC */
+        unsigned char id[EAPOL_WPA_KEY_ID_LEN];         /* WPA:Key ID, 802.11i/WPA2: Reserved */
+        unsigned char mic[EAPOL_WPA_KEY_MIC_LEN];       /* Key MIC */
+        unsigned short data_len;                        /* Key Data Length */
+        unsigned char data[EAPOL_WPA_KEY_DATA_LEN];     /* Key data */
+} BWL_POST_PACKED_STRUCT eapol_wpa_key_header_t;
+#define EAPOL_WPA_KEY_LEN               95
+/* WPA/802.11i/WPA2 KEY KEY_INFO bits */
+#define WPA_KEY_DESC_V1         0x01
+#define WPA_KEY_DESC_V2         0x02
+#define WPA_KEY_PAIRWISE        0x08
+#define WPA_KEY_INSTALL         0x40
+#define WPA_KEY_ACK             0x80
+#define WPA_KEY_MIC             0x100
+#define WPA_KEY_SECURE          0x200
+#define WPA_KEY_ERROR           0x400
+#define WPA_KEY_REQ             0x800
+/* WPA-only KEY KEY_INFO bits */
+#define WPA_KEY_INDEX_0         0x00
+#define WPA_KEY_INDEX_1         0x10
+#define WPA_KEY_INDEX_2         0x20
+#define WPA_KEY_INDEX_3         0x30
+#define WPA_KEY_INDEX_MASK      0x30
+#define WPA_KEY_INDEX_SHIFT     0x04
+/* 802.11i/WPA2-only KEY KEY_INFO bits */
+#define WPA_KEY_ENCRYPTED_DATA  0x1000
+/* Key Data encapsulation */
+typedef BWL_PRE_PACKED_STRUCT struct {
+        uint8 type;
+        uint8 length;
+        uint8 oui[3];
+        uint8 subtype;
+        uint8 data[1];
+} BWL_POST_PACKED_STRUCT eapol_wpa2_encap_data_t;
+#define EAPOL_WPA2_ENCAP_DATA_HDR_LEN   6
+#define WPA2_KEY_DATA_SUBTYPE_GTK       1
+#define WPA2_KEY_DATA_SUBTYPE_STAKEY    2
+#define WPA2_KEY_DATA_SUBTYPE_MAC       3
+#define WPA2_KEY_DATA_SUBTYPE_PMKID     4
+/* GTK encapsulation */
+typedef BWL_PRE_PACKED_STRUCT struct {
+        uint8   flags;
+        uint8   reserved;
+        uint8   gtk[EAPOL_WPA_MAX_KEY_SIZE];
+} BWL_POST_PACKED_STRUCT eapol_wpa2_key_gtk_encap_t;
+#define EAPOL_WPA2_KEY_GTK_ENCAP_HDR_LEN        2
+#define WPA2_GTK_INDEX_MASK     0x03
+#define WPA2_GTK_INDEX_SHIFT    0x00
+#define WPA2_GTK_TRANSMIT       0x04
+/* STAKey encapsulation */
+typedef BWL_PRE_PACKED_STRUCT struct {
+        uint8   reserved[2];
+        uint8   mac[ETHER_ADDR_LEN];
+        uint8   stakey[EAPOL_WPA_MAX_KEY_SIZE];
+} BWL_POST_PACKED_STRUCT eapol_wpa2_key_stakey_encap_t;
+#define WPA2_KEY_DATA_PAD       0xdd
+/* This marks the end of a packed structure section. */
+#include <packed_section_end.h>
+#endif /* _eapol_h_ */
diff --git a/drivers/net/wireless/bcm4329/include/proto/ethernet.h b/drivers/net/wireless/bcm4329/include/proto/ethernet.h
new file mode 100644
index 00000000000..9ad2ea0c70f
--- /dev/null
+++ b/drivers/net/wireless/bcm4329/include/proto/ethernet.h
@@ -0,0 +1,148 @@
+/*
+ * From FreeBSD 2.2.7: Fundamental constants relating to ethernet.
+ *
+ * Copyright (C) 1999-2010, Broadcom Corporation
+ * 
+ *      Unless you and Broadcom execute a separate written software license
+ * agreement governing use of this software, this software is licensed to you
+ * under the terms of the GNU General Public License version 2 (the "GPL"),
+ * available at http://www.broadcom.com/licenses/GPLv2.php, with the
+ * following added to such license:
+ * 
+ *      As a special exception, the copyright holders of this software give you
+ * permission to link this software with independent modules, and to copy and
+ * distribute the resulting executable under terms of your choice, provided that
+ * you also meet, for each linked independent module, the terms and conditions of
+ * the license of that module.  An independent module is a module which is not
+ * derived from this software.  The special exception does not apply to any
+ * modifications of the software.
+ * 
+ *      Notwithstanding the above, under no circumstances may you combine this
+ * software in any way with any other Broadcom software provided under a license
+ * other than the GPL, without Broadcom's express prior written consent.
+ *
+ * $Id: ethernet.h,v 9.45.56.5 2010/02/22 22:04:36 Exp $
+ */
+#ifndef _NET_ETHERNET_H_              
+#define _NET_ETHERNET_H_
+#ifndef _TYPEDEFS_H_
+#include "typedefs.h"
+#endif
+#include <packed_section_start.h>
+#define ETHER_ADDR_LEN          6
+#define ETHER_TYPE_LEN          2
+#define ETHER_CRC_LEN           4
+#define ETHER_HDR_LEN           (ETHER_ADDR_LEN * 2 + ETHER_TYPE_LEN)
+#define ETHER_MIN_LEN           64
+#define ETHER_MIN_DATA          46
+#define ETHER_MAX_LEN           1518
+#define ETHER_MAX_DATA          1500
+#define ETHER_TYPE_MIN          0x0600          
+#define ETHER_TYPE_IP           0x0800          
+#define ETHER_TYPE_ARP          0x0806          
+#define ETHER_TYPE_8021Q        0x8100          
+#define ETHER_TYPE_BRCM         0x886c          
+#define ETHER_TYPE_802_1X       0x888e          
+#define ETHER_TYPE_WAI          0x88b4          
+#ifdef BCMWPA2
+#define ETHER_TYPE_802_1X_PREAUTH 0x88c7        
+#endif
+#define ETHER_BRCM_SUBTYPE_LEN  4       
+#define ETHER_BRCM_CRAM         1       
+#define ETHER_DEST_OFFSET       (0 * ETHER_ADDR_LEN)    
+#define ETHER_SRC_OFFSET        (1 * ETHER_ADDR_LEN)    
+#define ETHER_TYPE_OFFSET       (2 * ETHER_ADDR_LEN)    
+#define ETHER_IS_VALID_LEN(foo) \
+        ((foo) >= ETHER_MIN_LEN && (foo) <= ETHER_MAX_LEN)
+#ifndef __INCif_etherh       
+BWL_PRE_PACKED_STRUCT struct ether_header {
+        uint8   ether_dhost[ETHER_ADDR_LEN];
+        uint8   ether_shost[ETHER_ADDR_LEN];
+        uint16  ether_type;
+} BWL_POST_PACKED_STRUCT;
+BWL_PRE_PACKED_STRUCT struct    ether_addr {
+        uint8 octet[ETHER_ADDR_LEN];
+} BWL_POST_PACKED_STRUCT;
+#endif  
+#define ETHER_SET_LOCALADDR(ea) (((uint8 *)(ea))[0] = (((uint8 *)(ea))[0] | 2))
+#define ETHER_IS_LOCALADDR(ea)  (((uint8 *)(ea))[0] & 2)
+#define ETHER_CLR_LOCALADDR(ea) (((uint8 *)(ea))[0] = (((uint8 *)(ea))[0] & 0xd))
+#define ETHER_TOGGLE_LOCALADDR(ea)      (((uint8 *)(ea))[0] = (((uint8 *)(ea))[0] ^ 2))
+#define ETHER_SET_UNICAST(ea)   (((uint8 *)(ea))[0] = (((uint8 *)(ea))[0] & ~1))
+#define ETHER_ISMULTI(ea) (((const uint8 *)(ea))[0] & 1)
+#define ether_cmp(a, b) (!(((short*)a)[0] == ((short*)b)[0]) | \
+                         !(((short*)a)[1] == ((short*)b)[1]) | \
+                         !(((short*)a)[2] == ((short*)b)[2]))
+#define ether_copy(s, d) { \
+                ((short*)d)[0] = ((short*)s)[0]; \
+                ((short*)d)[1] = ((short*)s)[1]; \
+                ((short*)d)[2] = ((short*)s)[2]; }
+static const struct ether_addr ether_bcast = {{255, 255, 255, 255, 255, 255}};
+static const struct ether_addr ether_null = {{0, 0, 0, 0, 0, 0}};
+#define ETHER_ISBCAST(ea)       ((((uint8 *)(ea))[0] &          \
+                                  ((uint8 *)(ea))[1] &          \
+                                  ((uint8 *)(ea))[2] &          \
+                                  ((uint8 *)(ea))[3] &          \
+                                  ((uint8 *)(ea))[4] &          \
+                                  ((uint8 *)(ea))[5]) == 0xff)
+#define ETHER_ISNULLADDR(ea)    ((((uint8 *)(ea))[0] |          \
+                                  ((uint8 *)(ea))[1] |          \
+                                  ((uint8 *)(ea))[2] |          \
+                                  ((uint8 *)(ea))[3] |          \
+                                  ((uint8 *)(ea))[4] |          \
+                                  ((uint8 *)(ea))[5]) == 0)
+#include <packed_section_end.h>
+#endif 
diff --git a/drivers/net/wireless/bcm4329/include/proto/sdspi.h b/drivers/net/wireless/bcm4329/include/proto/sdspi.h
new file mode 100644
index 00000000000..7739e68a244
--- /dev/null
+++ b/drivers/net/wireless/bcm4329/include/proto/sdspi.h
@@ -0,0 +1,71 @@
+/*
+ * SD-SPI Protocol Standard
+ *
+ * Copyright (C) 1999-2010, Broadcom Corporation
+ * 
+ *      Unless you and Broadcom execute a separate written software license
+ * agreement governing use of this software, this software is licensed to you
+ * under the terms of the GNU General Public License version 2 (the "GPL"),
+ * available at http://www.broadcom.com/licenses/GPLv2.php, with the
+ * following added to such license:
+ * 
+ *      As a special exception, the copyright holders of this software give you
+ * permission to link this software with independent modules, and to copy and
+ * distribute the resulting executable under terms of your choice, provided that
+ * you also meet, for each linked independent module, the terms and conditions of
+ * the license of that module.  An independent module is a module which is not
+ * derived from this software.  The special exception does not apply to any
+ * modifications of the software.
+ * 
+ *      Notwithstanding the above, under no circumstances may you combine this
+ * software in any way with any other Broadcom software provided under a license
+ * other than the GPL, without Broadcom's express prior written consent.
+ *
+ * $Id: sdspi.h,v 9.1.20.1 2008/05/06 22:59:19 Exp $
+ */
+#define SPI_START_M             BITFIELD_MASK(1)        /* Bit [31]     - Start Bit */
+#define SPI_START_S             31
+#define SPI_DIR_M               BITFIELD_MASK(1)        /* Bit [30]     - Direction */
+#define SPI_DIR_S               30
+#define SPI_CMD_INDEX_M         BITFIELD_MASK(6)        /* Bits [29:24] - Command number */
+#define SPI_CMD_INDEX_S         24
+#define SPI_RW_M                BITFIELD_MASK(1)        /* Bit [23]     - Read=0, Write=1 */
+#define SPI_RW_S                23
+#define SPI_FUNC_M              BITFIELD_MASK(3)        /* Bits [22:20] - Function Number */
+#define SPI_FUNC_S              20
+#define SPI_RAW_M               BITFIELD_MASK(1)        /* Bit [19]     - Read After Wr */
+#define SPI_RAW_S               19
+#define SPI_STUFF_M             BITFIELD_MASK(1)        /* Bit [18]     - Stuff bit */
+#define SPI_STUFF_S             18
+#define SPI_BLKMODE_M           BITFIELD_MASK(1)        /* Bit [19]     - Blockmode 1=blk */
+#define SPI_BLKMODE_S           19
+#define SPI_OPCODE_M            BITFIELD_MASK(1)        /* Bit [18]     - OP Code */
+#define SPI_OPCODE_S            18
+#define SPI_ADDR_M              BITFIELD_MASK(17)       /* Bits [17:1]  - Address */
+#define SPI_ADDR_S              1
+#define SPI_STUFF0_M            BITFIELD_MASK(1)        /* Bit [0]      - Stuff bit */
+#define SPI_STUFF0_S            0
+#define SPI_RSP_START_M         BITFIELD_MASK(1)        /* Bit [7]      - Start Bit (always 0) */
+#define SPI_RSP_START_S         7
+#define SPI_RSP_PARAM_ERR_M     BITFIELD_MASK(1)        /* Bit [6]      - Parameter Error */
+#define SPI_RSP_PARAM_ERR_S     6
+#define SPI_RSP_RFU5_M          BITFIELD_MASK(1)        /* Bit [5]      - RFU (Always 0) */
+#define SPI_RSP_RFU5_S          5
+#define SPI_RSP_FUNC_ERR_M      BITFIELD_MASK(1)        /* Bit [4]      - Function number error */
+#define SPI_RSP_FUNC_ERR_S      4
+#define SPI_RSP_CRC_ERR_M       BITFIELD_MASK(1)        /* Bit [3]      - COM CRC Error */
+#define SPI_RSP_CRC_ERR_S       3
+#define SPI_RSP_ILL_CMD_M       BITFIELD_MASK(1)        /* Bit [2]      - Illegal Command error */
+#define SPI_RSP_ILL_CMD_S       2
+#define SPI_RSP_RFU1_M          BITFIELD_MASK(1)        /* Bit [1]      - RFU (Always 0) */
+#define SPI_RSP_RFU1_S          1
+#define SPI_RSP_IDLE_M          BITFIELD_MASK(1)        /* Bit [0]      - In idle state */
+#define SPI_RSP_IDLE_S          0
+/* SD-SPI Protocol Definitions */
+#define SDSPI_COMMAND_LEN       6       /* Number of bytes in an SD command */
+#define SDSPI_START_BLOCK       0xFE    /* SD Start Block Token */
+#define SDSPI_IDLE_PAD          0xFF    /* SD-SPI idle value for MOSI */
+#define SDSPI_START_BIT_MASK    0x80
diff --git a/drivers/net/wireless/bcm4329/include/proto/vlan.h b/drivers/net/wireless/bcm4329/include/proto/vlan.h
new file mode 100644
index 00000000000..670bc44c6bd
--- /dev/null
+++ b/drivers/net/wireless/bcm4329/include/proto/vlan.h
@@ -0,0 +1,63 @@
+/*
+ * 802.1Q VLAN protocol definitions
+ *
+ * Copyright (C) 1999-2010, Broadcom Corporation
+ * 
+ *      Unless you and Broadcom execute a separate written software license
+ * agreement governing use of this software, this software is licensed to you
+ * under the terms of the GNU General Public License version 2 (the "GPL"),
+ * available at http://www.broadcom.com/licenses/GPLv2.php, with the
+ * following added to such license:
+ * 
+ *      As a special exception, the copyright holders of this software give you
+ * permission to link this software with independent modules, and to copy and
+ * distribute the resulting executable under terms of your choice, provided that
+ * you also meet, for each linked independent module, the terms and conditions of
+ * the license of that module.  An independent module is a module which is not
+ * derived from this software.  The special exception does not apply to any
+ * modifications of the software.
+ * 
+ *      Notwithstanding the above, under no circumstances may you combine this
+ * software in any way with any other Broadcom software provided under a license
+ * other than the GPL, without Broadcom's express prior written consent.
+ *
+ * $Id: vlan.h,v 9.4.196.2 2008/12/07 21:19:20 Exp $
+ */
+#ifndef _vlan_h_
+#define _vlan_h_
+#ifndef _TYPEDEFS_H_
+#include <typedefs.h>
+#endif
+#include <packed_section_start.h>
+#define VLAN_VID_MASK           0xfff   
+#define VLAN_CFI_SHIFT          12      
+#define VLAN_PRI_SHIFT          13      
+#define VLAN_PRI_MASK           7       
+#define VLAN_TAG_LEN            4
+#define VLAN_TAG_OFFSET         (2 * ETHER_ADDR_LEN)    
+#define VLAN_TPID               0x8100  
+struct ethervlan_header {
+        uint8   ether_dhost[ETHER_ADDR_LEN];
+        uint8   ether_shost[ETHER_ADDR_LEN];
+        uint16  vlan_type;              
+        uint16  vlan_tag;               
+        uint16  ether_type;
+};
+#define ETHERVLAN_HDR_LEN       (ETHER_HDR_LEN + VLAN_TAG_LEN)
+#include <packed_section_end.h>
+#endif 
diff --git a/drivers/net/wireless/bcm4329/include/proto/wpa.h b/drivers/net/wireless/bcm4329/include/proto/wpa.h
new file mode 100644
index 00000000000..f5d0cd53977
--- /dev/null
+++ b/drivers/net/wireless/bcm4329/include/proto/wpa.h
@@ -0,0 +1,159 @@
+/*
+ * Fundamental types and constants relating to WPA
+ *
+ * Copyright (C) 1999-2010, Broadcom Corporation
+ * 
+ *      Unless you and Broadcom execute a separate written software license
+ * agreement governing use of this software, this software is licensed to you
+ * under the terms of the GNU General Public License version 2 (the "GPL"),
+ * available at http://www.broadcom.com/licenses/GPLv2.php, with the
+ * following added to such license:
+ * 
+ *      As a special exception, the copyright holders of this software give you
+ * permission to link this software with independent modules, and to copy and
+ * distribute the resulting executable under terms of your choice, provided that
+ * you also meet, for each linked independent module, the terms and conditions of
+ * the license of that module.  An independent module is a module which is not
+ * derived from this software.  The special exception does not apply to any
+ * modifications of the software.
+ * 
+ *      Notwithstanding the above, under no circumstances may you combine this
+ * software in any way with any other Broadcom software provided under a license
+ * other than the GPL, without Broadcom's express prior written consent.
+ *
+ * $Id: wpa.h,v 1.16.166.1.20.1 2008/11/20 00:51:31 Exp $
+ */
+#ifndef _proto_wpa_h_
+#define _proto_wpa_h_
+#include <typedefs.h>
+#include <proto/ethernet.h>
+#include <packed_section_start.h>
+#define DOT11_RC_INVALID_WPA_IE         13      
+#define DOT11_RC_MIC_FAILURE            14      
+#define DOT11_RC_4WH_TIMEOUT            15      
+#define DOT11_RC_GTK_UPDATE_TIMEOUT     16      
+#define DOT11_RC_WPA_IE_MISMATCH        17      
+#define DOT11_RC_INVALID_MC_CIPHER      18      
+#define DOT11_RC_INVALID_UC_CIPHER      19      
+#define DOT11_RC_INVALID_AKMP           20      
+#define DOT11_RC_BAD_WPA_VERSION        21      
+#define DOT11_RC_INVALID_WPA_CAP        22      
+#define DOT11_RC_8021X_AUTH_FAIL        23      
+#define WPA2_PMKID_LEN  16
+typedef BWL_PRE_PACKED_STRUCT struct
+{
+        uint8 tag;      
+        uint8 length;   
+        uint8 oui[3];   
+        uint8 oui_type; 
+        BWL_PRE_PACKED_STRUCT struct {
+                uint8 low;
+                uint8 high;
+        } BWL_POST_PACKED_STRUCT version;       
+} BWL_POST_PACKED_STRUCT wpa_ie_fixed_t;
+#define WPA_IE_OUITYPE_LEN      4
+#define WPA_IE_FIXED_LEN        8
+#define WPA_IE_TAG_FIXED_LEN    6
+typedef BWL_PRE_PACKED_STRUCT struct {
+        uint8 tag;      
+        uint8 length;   
+        BWL_PRE_PACKED_STRUCT struct {
+                uint8 low;
+                uint8 high;
+        } BWL_POST_PACKED_STRUCT version;       
+} BWL_POST_PACKED_STRUCT wpa_rsn_ie_fixed_t;
+#define WPA_RSN_IE_FIXED_LEN    4
+#define WPA_RSN_IE_TAG_FIXED_LEN        2
+typedef uint8 wpa_pmkid_t[WPA2_PMKID_LEN];
+typedef BWL_PRE_PACKED_STRUCT struct
+{
+        uint8 oui[3];
+        uint8 type;
+} BWL_POST_PACKED_STRUCT wpa_suite_t, wpa_suite_mcast_t;
+#define WPA_SUITE_LEN   4
+typedef BWL_PRE_PACKED_STRUCT struct
+{
+        BWL_PRE_PACKED_STRUCT struct {
+                uint8 low;
+                uint8 high;
+        } BWL_POST_PACKED_STRUCT count;
+        wpa_suite_t list[1];
+} BWL_POST_PACKED_STRUCT wpa_suite_ucast_t, wpa_suite_auth_key_mgmt_t;
+#define WPA_IE_SUITE_COUNT_LEN  2
+typedef BWL_PRE_PACKED_STRUCT struct
+{
+        BWL_PRE_PACKED_STRUCT struct {
+                uint8 low;
+                uint8 high;
+        } BWL_POST_PACKED_STRUCT count;
+        wpa_pmkid_t list[1];
+} BWL_POST_PACKED_STRUCT wpa_pmkid_list_t;
+#define WPA_CIPHER_NONE         0       
+#define WPA_CIPHER_WEP_40       1       
+#define WPA_CIPHER_TKIP         2       
+#define WPA_CIPHER_AES_OCB      3       
+#define WPA_CIPHER_AES_CCM      4       
+#define WPA_CIPHER_WEP_104      5       
+#define IS_WPA_CIPHER(cipher)   ((cipher) == WPA_CIPHER_NONE || \
+                                 (cipher) == WPA_CIPHER_WEP_40 || \
+                                 (cipher) == WPA_CIPHER_WEP_104 || \
+                                 (cipher) == WPA_CIPHER_TKIP || \
+                                 (cipher) == WPA_CIPHER_AES_OCB || \
+                                 (cipher) == WPA_CIPHER_AES_CCM)
+#define WPA_TKIP_CM_DETECT      60      
+#define WPA_TKIP_CM_BLOCK       60      
+#define RSN_CAP_LEN             2       
+#define RSN_CAP_PREAUTH                 0x0001
+#define RSN_CAP_NOPAIRWISE              0x0002
+#define RSN_CAP_PTK_REPLAY_CNTR_MASK    0x000C
+#define RSN_CAP_PTK_REPLAY_CNTR_SHIFT   2
+#define RSN_CAP_GTK_REPLAY_CNTR_MASK    0x0030
+#define RSN_CAP_GTK_REPLAY_CNTR_SHIFT   4
+#define RSN_CAP_1_REPLAY_CNTR           0
+#define RSN_CAP_2_REPLAY_CNTRS          1
+#define RSN_CAP_4_REPLAY_CNTRS          2
+#define RSN_CAP_16_REPLAY_CNTRS         3
+#define WPA_CAP_4_REPLAY_CNTRS          RSN_CAP_4_REPLAY_CNTRS
+#define WPA_CAP_16_REPLAY_CNTRS         RSN_CAP_16_REPLAY_CNTRS
+#define WPA_CAP_REPLAY_CNTR_SHIFT       RSN_CAP_PTK_REPLAY_CNTR_SHIFT
+#define WPA_CAP_REPLAY_CNTR_MASK        RSN_CAP_PTK_REPLAY_CNTR_MASK
+#define WPA_CAP_LEN     RSN_CAP_LEN     
+#define WPA_CAP_WPA2_PREAUTH            RSN_CAP_PREAUTH
+#include <packed_section_end.h>
+#endif