diff options
-rw-r--r-- | drivers/staging/rtl8712/ieee80211.h | 26 | ||||
-rw-r--r-- | drivers/staging/rtl8712/if_ether.h | 4 | ||||
-rw-r--r-- | drivers/staging/rtl8712/ip.h | 34 | ||||
-rw-r--r-- | drivers/staging/rtl8712/mlme_osdep.h | 4 | ||||
-rw-r--r-- | drivers/staging/rtl8712/osdep_service.h | 3 | ||||
-rw-r--r-- | drivers/staging/rtl8712/recv_osdep.h | 4 | ||||
-rw-r--r-- | drivers/staging/rtl8712/rtl8712_event.h | 25 | ||||
-rw-r--r-- | drivers/staging/rtl8712/rtl8712_hal.h | 100 | ||||
-rw-r--r-- | drivers/staging/rtl8712/rtl8712_recv.h | 2 | ||||
-rw-r--r-- | drivers/staging/rtl8712/rtl8712_xmit.h | 11 | ||||
-rw-r--r-- | drivers/staging/rtl8712/rtl871x_cmd.h | 26 | ||||
-rw-r--r-- | drivers/staging/rtl8712/rtl871x_event.h | 12 | ||||
-rw-r--r-- | drivers/staging/rtl8712/rtl871x_ioctl_set.h | 16 | ||||
-rw-r--r-- | drivers/staging/rtl8712/rtl871x_mp_ioctl.h | 10 | ||||
-rw-r--r-- | drivers/staging/rtl8712/rtl871x_recv.h | 4 | ||||
-rw-r--r-- | drivers/staging/rtl8712/rtl871x_rf.h | 2 | ||||
-rw-r--r-- | drivers/staging/rtl8712/rtl871x_security.h | 51 | ||||
-rw-r--r-- | drivers/staging/rtl8712/rtl871x_xmit.h | 3 | ||||
-rw-r--r-- | drivers/staging/rtl8712/wifi.h | 63 | ||||
-rw-r--r-- | drivers/staging/rtl8712/wlan_bssdef.h | 212 |
20 files changed, 306 insertions, 306 deletions
diff --git a/drivers/staging/rtl8712/ieee80211.h b/drivers/staging/rtl8712/ieee80211.h index 432cf8a7605..1f4d147c4b6 100644 --- a/drivers/staging/rtl8712/ieee80211.h +++ b/drivers/staging/rtl8712/ieee80211.h | |||
@@ -76,7 +76,7 @@ struct ieee_param { | |||
76 | u8 reserved[32]; | 76 | u8 reserved[32]; |
77 | u8 data[0]; | 77 | u8 data[0]; |
78 | } wpa_ie; | 78 | } wpa_ie; |
79 | struct{ | 79 | struct { |
80 | int command; | 80 | int command; |
81 | int reason_code; | 81 | int reason_code; |
82 | } mlme; | 82 | } mlme; |
@@ -149,11 +149,11 @@ struct ieee80211_hdr_qos { | |||
149 | struct ieee80211_hdr_3addr_qos { | 149 | struct ieee80211_hdr_3addr_qos { |
150 | u16 frame_ctl; | 150 | u16 frame_ctl; |
151 | u16 duration_id; | 151 | u16 duration_id; |
152 | u8 addr1[ETH_ALEN]; | 152 | u8 addr1[ETH_ALEN]; |
153 | u8 addr2[ETH_ALEN]; | 153 | u8 addr2[ETH_ALEN]; |
154 | u8 addr3[ETH_ALEN]; | 154 | u8 addr3[ETH_ALEN]; |
155 | u16 seq_ctl; | 155 | u16 seq_ctl; |
156 | u16 qc; | 156 | u16 qc; |
157 | } __attribute__ ((packed)); | 157 | } __attribute__ ((packed)); |
158 | 158 | ||
159 | struct eapol { | 159 | struct eapol { |
@@ -461,7 +461,7 @@ struct ieee80211_stats { | |||
461 | uint rx_message_in_bad_msg_fragments; | 461 | uint rx_message_in_bad_msg_fragments; |
462 | }; | 462 | }; |
463 | 463 | ||
464 | struct ieee80211_softmac_stats{ | 464 | struct ieee80211_softmac_stats { |
465 | uint rx_ass_ok; | 465 | uint rx_ass_ok; |
466 | uint rx_ass_err; | 466 | uint rx_ass_err; |
467 | uint rx_probe_rq; | 467 | uint rx_probe_rq; |
@@ -754,15 +754,17 @@ struct registry_priv; | |||
754 | u8 *r8712_set_ie(u8 *pbuf, sint index, uint len, u8 *source, uint *frlen); | 754 | u8 *r8712_set_ie(u8 *pbuf, sint index, uint len, u8 *source, uint *frlen); |
755 | u8 *r8712_get_ie(u8*pbuf, sint index, sint *len, sint limit); | 755 | u8 *r8712_get_ie(u8*pbuf, sint index, sint *len, sint limit); |
756 | unsigned char *r8712_get_wpa_ie(unsigned char *pie, int *rsn_ie_len, int limit); | 756 | unsigned char *r8712_get_wpa_ie(unsigned char *pie, int *rsn_ie_len, int limit); |
757 | unsigned char *r8712_get_wpa2_ie(unsigned char *pie, int *rsn_ie_len, int limit); | 757 | unsigned char *r8712_get_wpa2_ie(unsigned char *pie, int *rsn_ie_len, |
758 | int limit); | ||
758 | int r8712_parse_wpa_ie(u8 *wpa_ie, int wpa_ie_len, int *group_cipher, | 759 | int r8712_parse_wpa_ie(u8 *wpa_ie, int wpa_ie_len, int *group_cipher, |
759 | int *pairwise_cipher); | 760 | int *pairwise_cipher); |
760 | int r8712_parse_wpa2_ie(u8 *wpa_ie, int wpa_ie_len, int *group_cipher, | 761 | int r8712_parse_wpa2_ie(u8 *wpa_ie, int wpa_ie_len, int *group_cipher, |
761 | int *pairwise_cipher); | 762 | int *pairwise_cipher); |
762 | int r8712_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len, u8 *wpa_ie, | 763 | int r8712_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len, |
763 | u16 *wpa_len); | 764 | u8 *wpa_ie, u16 *wpa_len); |
764 | int r8712_get_wps_ie(u8 *in_ie, uint in_len, u8 *wps_ie, uint *wps_ielen); | 765 | int r8712_get_wps_ie(u8 *in_ie, uint in_len, u8 *wps_ie, uint *wps_ielen); |
765 | int r8712_generate_ie(struct registry_priv *pregistrypriv, struct _adapter *padapter); | 766 | int r8712_generate_ie(struct registry_priv *pregistrypriv, |
767 | struct _adapter *padapter); | ||
766 | uint r8712_is_cckrates_included(u8 *rate); | 768 | uint r8712_is_cckrates_included(u8 *rate); |
767 | uint r8712_is_cckratesonly_included(u8 *rate); | 769 | uint r8712_is_cckratesonly_included(u8 *rate); |
768 | 770 | ||
diff --git a/drivers/staging/rtl8712/if_ether.h b/drivers/staging/rtl8712/if_ether.h index 36a2ba5c86f..0e9753b9ed3 100644 --- a/drivers/staging/rtl8712/if_ether.h +++ b/drivers/staging/rtl8712/if_ether.h | |||
@@ -99,8 +99,8 @@ struct ethhdr { | |||
99 | }; | 99 | }; |
100 | 100 | ||
101 | struct _vlan { | 101 | struct _vlan { |
102 | unsigned short h_vlan_TCI; /* Encapsulates priority and VLAN ID*/ | 102 | unsigned short h_vlan_TCI; /* Encapsulates priority and VLAN ID*/ |
103 | unsigned short h_vlan_encapsulated_proto; | 103 | unsigned short h_vlan_encapsulated_proto; |
104 | }; | 104 | }; |
105 | 105 | ||
106 | 106 | ||
diff --git a/drivers/staging/rtl8712/ip.h b/drivers/staging/rtl8712/ip.h index 4785a591486..f37b0f8d14d 100644 --- a/drivers/staging/rtl8712/ip.h +++ b/drivers/staging/rtl8712/ip.h | |||
@@ -90,23 +90,23 @@ | |||
90 | #define IPOPT_TS_PRESPEC 3 /* specified modules only */ | 90 | #define IPOPT_TS_PRESPEC 3 /* specified modules only */ |
91 | 91 | ||
92 | struct ip_options { | 92 | struct ip_options { |
93 | __u32 faddr; /* Saved first hop address */ | 93 | __u32 faddr; /* Saved first hop address */ |
94 | unsigned char optlen; | 94 | unsigned char optlen; |
95 | unsigned char srr; | 95 | unsigned char srr; |
96 | unsigned char rr; | 96 | unsigned char rr; |
97 | unsigned char ts; | 97 | unsigned char ts; |
98 | unsigned char is_setbyuser:1, /* Set by setsockopt? */ | 98 | unsigned char is_setbyuser:1, /* Set by setsockopt? */ |
99 | is_data:1, /* Options in __data, rather than skb */ | 99 | is_data:1, /* Options in __data, rather than skb */ |
100 | is_strictroute:1, /* Strict source route */ | 100 | is_strictroute:1, /* Strict source route */ |
101 | srr_is_hit:1, /* Packet destination addr was our one */ | 101 | srr_is_hit:1, /* Packet destination addr was our one*/ |
102 | is_changed:1, /* IP checksum more not valid */ | 102 | is_changed:1, /* IP checksum more not valid */ |
103 | rr_needaddr:1, /* Need to record addr of outgoing dev */ | 103 | rr_needaddr:1, /* Need to record addr of outgoing dev*/ |
104 | ts_needtime:1, /* Need to record timestamp */ | 104 | ts_needtime:1, /* Need to record timestamp */ |
105 | ts_needaddr:1; /* Need to record addr of outgoing dev */ | 105 | ts_needaddr:1; /* Need to record addr of outgoing dev*/ |
106 | unsigned char router_alert; | 106 | unsigned char router_alert; |
107 | unsigned char __pad1; | 107 | unsigned char __pad1; |
108 | unsigned char __pad2; | 108 | unsigned char __pad2; |
109 | unsigned char __data[0]; | 109 | unsigned char __data[0]; |
110 | }; | 110 | }; |
111 | 111 | ||
112 | #define optlength(opt) (sizeof(struct ip_options) + opt->optlen) | 112 | #define optlength(opt) (sizeof(struct ip_options) + opt->optlen) |
diff --git a/drivers/staging/rtl8712/mlme_osdep.h b/drivers/staging/rtl8712/mlme_osdep.h index 7013a498080..968e78765a3 100644 --- a/drivers/staging/rtl8712/mlme_osdep.h +++ b/drivers/staging/rtl8712/mlme_osdep.h | |||
@@ -9,8 +9,8 @@ void r8712_os_indicate_disconnect(struct _adapter *adapter); | |||
9 | void r8712_os_indicate_connect(struct _adapter *adapter); | 9 | void r8712_os_indicate_connect(struct _adapter *adapter); |
10 | void r8712_report_sec_ie(struct _adapter *adapter, u8 authmode, u8 *sec_ie); | 10 | void r8712_report_sec_ie(struct _adapter *adapter, u8 authmode, u8 *sec_ie); |
11 | int r8712_recv_indicatepkts_in_order(struct _adapter *adapter, | 11 | int r8712_recv_indicatepkts_in_order(struct _adapter *adapter, |
12 | struct recv_reorder_ctrl *precvreorder_ctrl, | 12 | struct recv_reorder_ctrl *precvreorder_ctrl, |
13 | int bforced); | 13 | int bforced); |
14 | void r8712_indicate_wx_assoc_event(struct _adapter *padapter); | 14 | void r8712_indicate_wx_assoc_event(struct _adapter *padapter); |
15 | void r8712_indicate_wx_disassoc_event(struct _adapter *padapter); | 15 | void r8712_indicate_wx_disassoc_event(struct _adapter *padapter); |
16 | 16 | ||
diff --git a/drivers/staging/rtl8712/osdep_service.h b/drivers/staging/rtl8712/osdep_service.h index 36eeb5a1b5a..3d3f73c5cd5 100644 --- a/drivers/staging/rtl8712/osdep_service.h +++ b/drivers/staging/rtl8712/osdep_service.h | |||
@@ -145,7 +145,8 @@ static inline u32 is_list_empty(struct list_head *phead) | |||
145 | return false; | 145 | return false; |
146 | } | 146 | } |
147 | 147 | ||
148 | static inline void list_insert_tail(struct list_head *plist, struct list_head *phead) | 148 | static inline void list_insert_tail(struct list_head *plist, |
149 | struct list_head *phead) | ||
149 | { | 150 | { |
150 | list_add_tail(plist, phead); | 151 | list_add_tail(plist, phead); |
151 | } | 152 | } |
diff --git a/drivers/staging/rtl8712/recv_osdep.h b/drivers/staging/rtl8712/recv_osdep.h index b23dd6b159f..60a54dd90ff 100644 --- a/drivers/staging/rtl8712/recv_osdep.h +++ b/drivers/staging/rtl8712/recv_osdep.h | |||
@@ -12,7 +12,8 @@ s32 r8712_recv_entry(union recv_frame *precv_frame); | |||
12 | void r8712_recv_indicatepkt(struct _adapter *adapter, | 12 | void r8712_recv_indicatepkt(struct _adapter *adapter, |
13 | union recv_frame *precv_frame); | 13 | union recv_frame *precv_frame); |
14 | void r8712_handle_tkip_mic_err(struct _adapter *padapter, u8 bgroup); | 14 | void r8712_handle_tkip_mic_err(struct _adapter *padapter, u8 bgroup); |
15 | int r8712_init_recv_priv(struct recv_priv *precvpriv, struct _adapter *padapter); | 15 | int r8712_init_recv_priv(struct recv_priv *precvpriv, |
16 | struct _adapter *padapter); | ||
16 | void r8712_free_recv_priv(struct recv_priv *precvpriv); | 17 | void r8712_free_recv_priv(struct recv_priv *precvpriv); |
17 | int r8712_os_recv_resource_alloc(struct _adapter *padapter, | 18 | int r8712_os_recv_resource_alloc(struct _adapter *padapter, |
18 | union recv_frame *precvframe); | 19 | union recv_frame *precvframe); |
@@ -24,4 +25,3 @@ void r8712_os_read_port(struct _adapter *padapter, struct recv_buf *precvbuf); | |||
24 | void r8712_init_recv_timer(struct recv_reorder_ctrl *preorder_ctrl); | 25 | void r8712_init_recv_timer(struct recv_reorder_ctrl *preorder_ctrl); |
25 | 26 | ||
26 | #endif | 27 | #endif |
27 | |||
diff --git a/drivers/staging/rtl8712/rtl8712_event.h b/drivers/staging/rtl8712/rtl8712_event.h index 48408f72546..27316934b1a 100644 --- a/drivers/staging/rtl8712/rtl8712_event.h +++ b/drivers/staging/rtl8712/rtl8712_event.h | |||
@@ -5,33 +5,33 @@ void r8712_event_handle(struct _adapter *padapter, uint *peventbuf); | |||
5 | void r8712_got_addbareq_event_callback(struct _adapter *adapter , u8 *pbuf); | 5 | void r8712_got_addbareq_event_callback(struct _adapter *adapter , u8 *pbuf); |
6 | 6 | ||
7 | enum rtl8712_c2h_event { | 7 | enum rtl8712_c2h_event { |
8 | GEN_EVT_CODE(_Read_MACREG) = 0, /*0*/ | 8 | GEN_EVT_CODE(_Read_MACREG) = 0, /*0*/ |
9 | GEN_EVT_CODE(_Read_BBREG), | 9 | GEN_EVT_CODE(_Read_BBREG), |
10 | GEN_EVT_CODE(_Read_RFREG), | 10 | GEN_EVT_CODE(_Read_RFREG), |
11 | GEN_EVT_CODE(_Read_EEPROM), | 11 | GEN_EVT_CODE(_Read_EEPROM), |
12 | GEN_EVT_CODE(_Read_EFUSE), | 12 | GEN_EVT_CODE(_Read_EFUSE), |
13 | GEN_EVT_CODE(_Read_CAM), /*5*/ | 13 | GEN_EVT_CODE(_Read_CAM), /*5*/ |
14 | GEN_EVT_CODE(_Get_BasicRate), | 14 | GEN_EVT_CODE(_Get_BasicRate), |
15 | GEN_EVT_CODE(_Get_DataRate), | 15 | GEN_EVT_CODE(_Get_DataRate), |
16 | GEN_EVT_CODE(_Survey), /*8*/ | 16 | GEN_EVT_CODE(_Survey), /*8*/ |
17 | GEN_EVT_CODE(_SurveyDone), /*9*/ | 17 | GEN_EVT_CODE(_SurveyDone), /*9*/ |
18 | 18 | ||
19 | GEN_EVT_CODE(_JoinBss) , /*10*/ | 19 | GEN_EVT_CODE(_JoinBss), /*10*/ |
20 | GEN_EVT_CODE(_AddSTA), | 20 | GEN_EVT_CODE(_AddSTA), |
21 | GEN_EVT_CODE(_DelSTA), | 21 | GEN_EVT_CODE(_DelSTA), |
22 | GEN_EVT_CODE(_AtimDone) , | 22 | GEN_EVT_CODE(_AtimDone), |
23 | GEN_EVT_CODE(_TX_Report), | 23 | GEN_EVT_CODE(_TX_Report), |
24 | GEN_EVT_CODE(_CCX_Report), /*15*/ | 24 | GEN_EVT_CODE(_CCX_Report), /*15*/ |
25 | GEN_EVT_CODE(_DTM_Report), | 25 | GEN_EVT_CODE(_DTM_Report), |
26 | GEN_EVT_CODE(_TX_Rate_Statistics), | 26 | GEN_EVT_CODE(_TX_Rate_Statistics), |
27 | GEN_EVT_CODE(_C2HLBK), | 27 | GEN_EVT_CODE(_C2HLBK), |
28 | GEN_EVT_CODE(_FWDBG), | 28 | GEN_EVT_CODE(_FWDBG), |
29 | GEN_EVT_CODE(_C2HFEEDBACK), /*20*/ | 29 | GEN_EVT_CODE(_C2HFEEDBACK), /*20*/ |
30 | GEN_EVT_CODE(_ADDBA), | 30 | GEN_EVT_CODE(_ADDBA), |
31 | GEN_EVT_CODE(_C2HBCN), | 31 | GEN_EVT_CODE(_C2HBCN), |
32 | GEN_EVT_CODE(_ReportPwrState), /*filen: only for PCIE, USB*/ | 32 | GEN_EVT_CODE(_ReportPwrState), /*filen: only for PCIE, USB*/ |
33 | GEN_EVT_CODE(_WPS_PBC), /*24*/ | 33 | GEN_EVT_CODE(_WPS_PBC), /*24*/ |
34 | GEN_EVT_CODE(_ADDBAReq_Report), /*25*/ | 34 | GEN_EVT_CODE(_ADDBAReq_Report), /*25*/ |
35 | MAX_C2HEVT | 35 | MAX_C2HEVT |
36 | }; | 36 | }; |
37 | 37 | ||
@@ -48,7 +48,8 @@ static struct fwevent wlanevents[] = { | |||
48 | {0, NULL}, | 48 | {0, NULL}, |
49 | {0, NULL}, | 49 | {0, NULL}, |
50 | {0, &r8712_survey_event_callback}, /*8*/ | 50 | {0, &r8712_survey_event_callback}, /*8*/ |
51 | {sizeof(struct surveydone_event), &r8712_surveydone_event_callback},/*9*/ | 51 | {sizeof(struct surveydone_event), |
52 | &r8712_surveydone_event_callback}, /*9*/ | ||
52 | 53 | ||
53 | {0, &r8712_joinbss_event_callback}, /*10*/ | 54 | {0, &r8712_joinbss_event_callback}, /*10*/ |
54 | {sizeof(struct stassoc_event), &r8712_stassoc_event_callback}, | 55 | {sizeof(struct stassoc_event), &r8712_stassoc_event_callback}, |
@@ -59,8 +60,8 @@ static struct fwevent wlanevents[] = { | |||
59 | {0, NULL}, | 60 | {0, NULL}, |
60 | {0, NULL}, | 61 | {0, NULL}, |
61 | {0, NULL}, | 62 | {0, NULL}, |
62 | {0, NULL}, /*fwdbg_event_callback},*/ | 63 | {0, NULL}, /*fwdbg_event_callback},*/ |
63 | {0, NULL}, /*20*/ | 64 | {0, NULL}, /*20*/ |
64 | {0, NULL}, | 65 | {0, NULL}, |
65 | {0, NULL}, | 66 | {0, NULL}, |
66 | {0, &r8712_cpwm_event_callback}, | 67 | {0, &r8712_cpwm_event_callback}, |
diff --git a/drivers/staging/rtl8712/rtl8712_hal.h b/drivers/staging/rtl8712/rtl8712_hal.h index 13df2001e9a..66baa87cd4b 100644 --- a/drivers/staging/rtl8712/rtl8712_hal.h +++ b/drivers/staging/rtl8712/rtl8712_hal.h | |||
@@ -21,13 +21,13 @@ enum RTL871X_HCI_TYPE { | |||
21 | RTL8712_USB, | 21 | RTL8712_USB, |
22 | }; | 22 | }; |
23 | 23 | ||
24 | enum RTL8712_RF_CONFIG{ | 24 | enum RTL8712_RF_CONFIG { |
25 | RTL8712_RF_1T1R, | 25 | RTL8712_RF_1T1R, |
26 | RTL8712_RF_1T2R, | 26 | RTL8712_RF_1T2R, |
27 | RTL8712_RF_2T2R | 27 | RTL8712_RF_2T2R |
28 | }; | 28 | }; |
29 | 29 | ||
30 | enum _RTL8712_HCI_TYPE_{ | 30 | enum _RTL8712_HCI_TYPE_ { |
31 | RTL8712_HCI_TYPE_PCIE = 0x01, | 31 | RTL8712_HCI_TYPE_PCIE = 0x01, |
32 | RTL8712_HCI_TYPE_AP_PCIE = 0x81, | 32 | RTL8712_HCI_TYPE_AP_PCIE = 0x81, |
33 | RTL8712_HCI_TYPE_USB = 0x02, | 33 | RTL8712_HCI_TYPE_USB = 0x02, |
@@ -40,62 +40,62 @@ enum _RTL8712_HCI_TYPE_{ | |||
40 | 40 | ||
41 | struct fw_priv { /*8-bytes alignment required*/ | 41 | struct fw_priv { /*8-bytes alignment required*/ |
42 | /*--- long word 0 ----*/ | 42 | /*--- long word 0 ----*/ |
43 | unsigned char signature_0; /*0x12: CE product, 0x92: IT product*/ | 43 | unsigned char signature_0; /*0x12: CE product, 0x92: IT product*/ |
44 | unsigned char signature_1; /*0x87: CE product, 0x81: IT product*/ | 44 | unsigned char signature_1; /*0x87: CE product, 0x81: IT product*/ |
45 | unsigned char hci_sel; /*0x81: PCI-AP, 01:PCIe, 02: 92S-U, 0x82: USB-AP, | 45 | unsigned char hci_sel; /*0x81: PCI-AP, 01:PCIe, 02: 92S-U, 0x82: USB-AP, |
46 | * 0x12: 72S-U, 03:SDIO*/ | 46 | * 0x12: 72S-U, 03:SDIO*/ |
47 | unsigned char chip_version; /*the same value as register value*/ | 47 | unsigned char chip_version; /*the same value as register value*/ |
48 | unsigned char customer_ID_0; /*customer ID low byte*/ | 48 | unsigned char customer_ID_0; /*customer ID low byte*/ |
49 | unsigned char customer_ID_1; /*customer ID high byte*/ | 49 | unsigned char customer_ID_1; /*customer ID high byte*/ |
50 | unsigned char rf_config; /*0x11: 1T1R, 0x12: 1T2R, 0x92: 1T2R turbo, | 50 | unsigned char rf_config; /*0x11: 1T1R, 0x12: 1T2R, 0x92: 1T2R turbo, |
51 | * 0x22: 2T2R*/ | 51 | * 0x22: 2T2R*/ |
52 | unsigned char usb_ep_num; /* 4: 4EP, 6: 6EP, 11: 11EP*/ | 52 | unsigned char usb_ep_num; /* 4: 4EP, 6: 6EP, 11: 11EP*/ |
53 | /*--- long word 1 ----*/ | 53 | /*--- long word 1 ----*/ |
54 | unsigned char regulatory_class_0; /*regulatory class bit map 0*/ | 54 | unsigned char regulatory_class_0; /*regulatory class bit map 0*/ |
55 | unsigned char regulatory_class_1; /*regulatory class bit map 1*/ | 55 | unsigned char regulatory_class_1; /*regulatory class bit map 1*/ |
56 | unsigned char regulatory_class_2; /*regulatory class bit map 2*/ | 56 | unsigned char regulatory_class_2; /*regulatory class bit map 2*/ |
57 | unsigned char regulatory_class_3; /*regulatory class bit map 3*/ | 57 | unsigned char regulatory_class_3; /*regulatory class bit map 3*/ |
58 | unsigned char rfintfs; /* 0:SWSI, 1:HWSI, 2:HWPI*/ | 58 | unsigned char rfintfs; /* 0:SWSI, 1:HWSI, 2:HWPI*/ |
59 | unsigned char def_nettype; | 59 | unsigned char def_nettype; |
60 | unsigned char turboMode; | 60 | unsigned char turboMode; |
61 | unsigned char lowPowerMode;/* 0: noral mode, 1: low power mode*/ | 61 | unsigned char lowPowerMode;/* 0: noral mode, 1: low power mode*/ |
62 | /*--- long word 2 ----*/ | 62 | /*--- long word 2 ----*/ |
63 | unsigned char lbk_mode; /*0x00: normal, 0x03: MACLBK, 0x01: PHYLBK*/ | 63 | unsigned char lbk_mode; /*0x00: normal, 0x03: MACLBK, 0x01: PHYLBK*/ |
64 | unsigned char mp_mode; /* 1: for MP use, 0: for normal driver */ | 64 | unsigned char mp_mode; /* 1: for MP use, 0: for normal driver */ |
65 | unsigned char vcsType; /* 0:off 1:on 2:auto */ | 65 | unsigned char vcsType; /* 0:off 1:on 2:auto */ |
66 | unsigned char vcsMode; /* 1:RTS/CTS 2:CTS to self */ | 66 | unsigned char vcsMode; /* 1:RTS/CTS 2:CTS to self */ |
67 | unsigned char rsvd022; | 67 | unsigned char rsvd022; |
68 | unsigned char rsvd023; | 68 | unsigned char rsvd023; |
69 | unsigned char rsvd024; | 69 | unsigned char rsvd024; |
70 | unsigned char rsvd025; | 70 | unsigned char rsvd025; |
71 | /*--- long word 3 ----*/ | 71 | /*--- long word 3 ----*/ |
72 | unsigned char qos_en; /*1: QoS enable*/ | 72 | unsigned char qos_en; /*1: QoS enable*/ |
73 | unsigned char bw_40MHz_en; /*1: 40MHz BW enable*/ | 73 | unsigned char bw_40MHz_en; /*1: 40MHz BW enable*/ |
74 | unsigned char AMSDU2AMPDU_en; /*1: 4181 convert AMSDU to AMPDU, | 74 | unsigned char AMSDU2AMPDU_en; /*1: 4181 convert AMSDU to AMPDU, |
75 | * 0: disable*/ | 75 | * 0: disable*/ |
76 | unsigned char AMPDU_en; /*1: 11n AMPDU enable*/ | 76 | unsigned char AMPDU_en; /*1: 11n AMPDU enable*/ |
77 | unsigned char rate_control_offload; /*1: FW offloads, 0: driver handles*/ | 77 | unsigned char rate_control_offload; /*1: FW offloads,0: driver handles*/ |
78 | unsigned char aggregation_offload; /*1: FW offloads, 0: driver handles*/ | 78 | unsigned char aggregation_offload; /*1: FW offloads,0: driver handles*/ |
79 | unsigned char rsvd030; | 79 | unsigned char rsvd030; |
80 | unsigned char rsvd031; | 80 | unsigned char rsvd031; |
81 | /*--- long word 4 ----*/ | 81 | /*--- long word 4 ----*/ |
82 | unsigned char beacon_offload; /* 1. FW offloads, 0: driver handles*/ | 82 | unsigned char beacon_offload; /* 1. FW offloads, 0: driver handles*/ |
83 | unsigned char MLME_offload; /* 2. FW offloads, 0: driver handles*/ | 83 | unsigned char MLME_offload; /* 2. FW offloads, 0: driver handles*/ |
84 | unsigned char hwpc_offload; /* 3. FW offloads, 0: driver handles*/ | 84 | unsigned char hwpc_offload; /* 3. FW offloads, 0: driver handles*/ |
85 | unsigned char tcp_checksum_offload; /* 4. FW offloads, 0: driver handles*/ | 85 | unsigned char tcp_checksum_offload; /*4. FW offloads,0: driver handles*/ |
86 | unsigned char tcp_offload; /* 5. FW offloads, 0: driver handles*/ | 86 | unsigned char tcp_offload; /* 5. FW offloads, 0: driver handles*/ |
87 | unsigned char ps_control_offload; /* 6. FW offloads, 0: driver handles*/ | 87 | unsigned char ps_control_offload; /* 6. FW offloads, 0: driver handles*/ |
88 | unsigned char WWLAN_offload; /* 7. FW offloads, 0: driver handles*/ | 88 | unsigned char WWLAN_offload; /* 7. FW offloads, 0: driver handles*/ |
89 | unsigned char rsvd040; | 89 | unsigned char rsvd040; |
90 | /*--- long word 5 ----*/ | 90 | /*--- long word 5 ----*/ |
91 | unsigned char tcp_tx_frame_len_L; /*tcp tx packet length low byte*/ | 91 | unsigned char tcp_tx_frame_len_L; /*tcp tx packet length low byte*/ |
92 | unsigned char tcp_tx_frame_len_H; /*tcp tx packet length high byte*/ | 92 | unsigned char tcp_tx_frame_len_H; /*tcp tx packet length high byte*/ |
93 | unsigned char tcp_rx_frame_len_L; /*tcp rx packet length low byte*/ | 93 | unsigned char tcp_rx_frame_len_L; /*tcp rx packet length low byte*/ |
94 | unsigned char tcp_rx_frame_len_H; /*tcp rx packet length high byte*/ | 94 | unsigned char tcp_rx_frame_len_H; /*tcp rx packet length high byte*/ |
95 | unsigned char rsvd050; | 95 | unsigned char rsvd050; |
96 | unsigned char rsvd051; | 96 | unsigned char rsvd051; |
97 | unsigned char rsvd052; | 97 | unsigned char rsvd052; |
98 | unsigned char rsvd053; | 98 | unsigned char rsvd053; |
99 | }; | 99 | }; |
100 | 100 | ||
101 | struct fw_hdr {/*8-byte alinment required*/ | 101 | struct fw_hdr {/*8-byte alinment required*/ |
diff --git a/drivers/staging/rtl8712/rtl8712_recv.h b/drivers/staging/rtl8712/rtl8712_recv.h index 4ba52b9c169..c48757f97da 100644 --- a/drivers/staging/rtl8712/rtl8712_recv.h +++ b/drivers/staging/rtl8712/rtl8712_recv.h | |||
@@ -93,7 +93,7 @@ struct recv_buf { | |||
93 | end -----> | 93 | end -----> |
94 | len = (unsigned int )(tail - data); | 94 | len = (unsigned int )(tail - data); |
95 | */ | 95 | */ |
96 | struct recv_frame_hdr{ | 96 | struct recv_frame_hdr { |
97 | struct list_head list; | 97 | struct list_head list; |
98 | _pkt *pkt; | 98 | _pkt *pkt; |
99 | _pkt *pkt_newalloc; | 99 | _pkt *pkt_newalloc; |
diff --git a/drivers/staging/rtl8712/rtl8712_xmit.h b/drivers/staging/rtl8712/rtl8712_xmit.h index 5d77c510724..12a080f545a 100644 --- a/drivers/staging/rtl8712/rtl8712_xmit.h +++ b/drivers/staging/rtl8712/rtl8712_xmit.h | |||
@@ -59,25 +59,16 @@ | |||
59 | /*OFFSET 20*/ | 59 | /*OFFSET 20*/ |
60 | #define DISFB BIT(15) | 60 | #define DISFB BIT(15) |
61 | 61 | ||
62 | struct tx_desc{ | 62 | struct tx_desc { |
63 | |||
64 | /*DWORD 0*/ | 63 | /*DWORD 0*/ |
65 | unsigned int txdw0; | 64 | unsigned int txdw0; |
66 | |||
67 | unsigned int txdw1; | 65 | unsigned int txdw1; |
68 | |||
69 | unsigned int txdw2; | 66 | unsigned int txdw2; |
70 | |||
71 | unsigned int txdw3; | 67 | unsigned int txdw3; |
72 | |||
73 | unsigned int txdw4; | 68 | unsigned int txdw4; |
74 | |||
75 | unsigned int txdw5; | 69 | unsigned int txdw5; |
76 | |||
77 | unsigned int txdw6; | 70 | unsigned int txdw6; |
78 | |||
79 | unsigned int txdw7; | 71 | unsigned int txdw7; |
80 | |||
81 | }; | 72 | }; |
82 | 73 | ||
83 | 74 | ||
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.h b/drivers/staging/rtl8712/rtl871x_cmd.h index 2dc78476b7d..dcf256d44d1 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.h +++ b/drivers/staging/rtl8712/rtl871x_cmd.h | |||
@@ -562,54 +562,54 @@ struct getratable_rsp { | |||
562 | }; | 562 | }; |
563 | 563 | ||
564 | /*to get TX,RX retry count*/ | 564 | /*to get TX,RX retry count*/ |
565 | struct gettxretrycnt_parm{ | 565 | struct gettxretrycnt_parm { |
566 | unsigned int rsvd; | 566 | unsigned int rsvd; |
567 | }; | 567 | }; |
568 | 568 | ||
569 | struct gettxretrycnt_rsp{ | 569 | struct gettxretrycnt_rsp { |
570 | unsigned long tx_retrycnt; | 570 | unsigned long tx_retrycnt; |
571 | }; | 571 | }; |
572 | 572 | ||
573 | struct getrxretrycnt_parm{ | 573 | struct getrxretrycnt_parm { |
574 | unsigned int rsvd; | 574 | unsigned int rsvd; |
575 | }; | 575 | }; |
576 | 576 | ||
577 | struct getrxretrycnt_rsp{ | 577 | struct getrxretrycnt_rsp { |
578 | unsigned long rx_retrycnt; | 578 | unsigned long rx_retrycnt; |
579 | }; | 579 | }; |
580 | 580 | ||
581 | /*to get BCNOK,BCNERR count*/ | 581 | /*to get BCNOK,BCNERR count*/ |
582 | struct getbcnokcnt_parm{ | 582 | struct getbcnokcnt_parm { |
583 | unsigned int rsvd; | 583 | unsigned int rsvd; |
584 | }; | 584 | }; |
585 | 585 | ||
586 | struct getbcnokcnt_rsp{ | 586 | struct getbcnokcnt_rsp { |
587 | unsigned long bcnokcnt; | 587 | unsigned long bcnokcnt; |
588 | }; | 588 | }; |
589 | 589 | ||
590 | struct getbcnerrcnt_parm{ | 590 | struct getbcnerrcnt_parm { |
591 | unsigned int rsvd; | 591 | unsigned int rsvd; |
592 | }; | 592 | }; |
593 | struct getbcnerrcnt_rsp{ | 593 | struct getbcnerrcnt_rsp { |
594 | unsigned long bcnerrcnt; | 594 | unsigned long bcnerrcnt; |
595 | }; | 595 | }; |
596 | 596 | ||
597 | /* to get current TX power level*/ | 597 | /* to get current TX power level*/ |
598 | struct getcurtxpwrlevel_parm{ | 598 | struct getcurtxpwrlevel_parm { |
599 | unsigned int rsvd; | 599 | unsigned int rsvd; |
600 | }; | 600 | }; |
601 | 601 | ||
602 | struct getcurtxpwrlevel_rsp{ | 602 | struct getcurtxpwrlevel_rsp { |
603 | unsigned short tx_power; | 603 | unsigned short tx_power; |
604 | }; | 604 | }; |
605 | 605 | ||
606 | /*dynamic on/off DIG*/ | 606 | /*dynamic on/off DIG*/ |
607 | struct setdig_parm{ | 607 | struct setdig_parm { |
608 | unsigned char dig_on; /* 1:on , 0:off */ | 608 | unsigned char dig_on; /* 1:on , 0:off */ |
609 | }; | 609 | }; |
610 | 610 | ||
611 | /*dynamic on/off RA*/ | 611 | /*dynamic on/off RA*/ |
612 | struct setra_parm{ | 612 | struct setra_parm { |
613 | unsigned char ra_on; /* 1:on , 0:off */ | 613 | unsigned char ra_on; /* 1:on , 0:off */ |
614 | }; | 614 | }; |
615 | 615 | ||
diff --git a/drivers/staging/rtl8712/rtl871x_event.h b/drivers/staging/rtl8712/rtl871x_event.h index d45229356bf..6ce06767130 100644 --- a/drivers/staging/rtl8712/rtl871x_event.h +++ b/drivers/staging/rtl8712/rtl871x_event.h | |||
@@ -45,8 +45,8 @@ struct stassoc_event { | |||
45 | }; | 45 | }; |
46 | 46 | ||
47 | struct stadel_event { | 47 | struct stadel_event { |
48 | unsigned char macaddr[6]; | 48 | unsigned char macaddr[6]; |
49 | unsigned char rsvd[2]; | 49 | unsigned char rsvd[2]; |
50 | }; | 50 | }; |
51 | 51 | ||
52 | struct addba_event { | 52 | struct addba_event { |
@@ -61,7 +61,7 @@ struct fwevent { | |||
61 | }; | 61 | }; |
62 | 62 | ||
63 | #define C2HEVENT_SZ 32 | 63 | #define C2HEVENT_SZ 32 |
64 | struct event_node{ | 64 | struct event_node { |
65 | unsigned char *node; | 65 | unsigned char *node; |
66 | unsigned char evt_code; | 66 | unsigned char evt_code; |
67 | unsigned short evt_sz; | 67 | unsigned short evt_sz; |
@@ -85,9 +85,9 @@ struct network_queue { | |||
85 | }; | 85 | }; |
86 | 86 | ||
87 | struct ADDBA_Req_Report_parm { | 87 | struct ADDBA_Req_Report_parm { |
88 | unsigned char MacAddress[ETH_ALEN]; | 88 | unsigned char MacAddress[ETH_ALEN]; |
89 | unsigned short StartSeqNum; | 89 | unsigned short StartSeqNum; |
90 | unsigned char tid; | 90 | unsigned char tid; |
91 | }; | 91 | }; |
92 | #include "rtl8712_event.h" | 92 | #include "rtl8712_event.h" |
93 | 93 | ||
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_set.h b/drivers/staging/rtl8712/rtl871x_ioctl_set.h index 283afbfc1d0..8dff2b196ff 100644 --- a/drivers/staging/rtl8712/rtl871x_ioctl_set.h +++ b/drivers/staging/rtl8712/rtl871x_ioctl_set.h | |||
@@ -6,19 +6,27 @@ | |||
6 | typedef u8 NDIS_802_11_PMKID_VALUE[16]; | 6 | typedef u8 NDIS_802_11_PMKID_VALUE[16]; |
7 | 7 | ||
8 | struct BSSIDInfo { | 8 | struct BSSIDInfo { |
9 | unsigned char BSSID[6]; | 9 | unsigned char BSSID[6]; |
10 | NDIS_802_11_PMKID_VALUE PMKID; | 10 | NDIS_802_11_PMKID_VALUE PMKID; |
11 | }; | 11 | }; |
12 | 12 | ||
13 | u8 r8712_set_802_11_authentication_mode(struct _adapter *pdapter, | 13 | u8 r8712_set_802_11_authentication_mode(struct _adapter *pdapter, |
14 | enum NDIS_802_11_AUTHENTICATION_MODE authmode); | 14 | enum NDIS_802_11_AUTHENTICATION_MODE authmode); |
15 | |||
15 | u8 r8712_set_802_11_bssid(struct _adapter *padapter, u8 *bssid); | 16 | u8 r8712_set_802_11_bssid(struct _adapter *padapter, u8 *bssid); |
16 | u8 r8712_set_802_11_add_wep(struct _adapter *padapter, struct NDIS_802_11_WEP *wep); | 17 | |
18 | u8 r8712_set_802_11_add_wep(struct _adapter *padapter, | ||
19 | struct NDIS_802_11_WEP *wep); | ||
20 | |||
17 | u8 r8712_set_802_11_disassociate(struct _adapter *padapter); | 21 | u8 r8712_set_802_11_disassociate(struct _adapter *padapter); |
22 | |||
18 | u8 r8712_set_802_11_bssid_list_scan(struct _adapter *padapter); | 23 | u8 r8712_set_802_11_bssid_list_scan(struct _adapter *padapter); |
24 | |||
19 | u8 r8712_set_802_11_infrastructure_mode(struct _adapter *padapter, | 25 | u8 r8712_set_802_11_infrastructure_mode(struct _adapter *padapter, |
20 | enum NDIS_802_11_NETWORK_INFRASTRUCTURE networktype); | 26 | enum NDIS_802_11_NETWORK_INFRASTRUCTURE networktype); |
21 | void r8712_set_802_11_ssid(struct _adapter *padapter, struct ndis_802_11_ssid *ssid); | 27 | |
28 | void r8712_set_802_11_ssid(struct _adapter *padapter, | ||
29 | struct ndis_802_11_ssid *ssid); | ||
22 | 30 | ||
23 | #endif | 31 | #endif |
24 | 32 | ||
diff --git a/drivers/staging/rtl8712/rtl871x_mp_ioctl.h b/drivers/staging/rtl8712/rtl871x_mp_ioctl.h index fdd2278936d..67759c31b1d 100644 --- a/drivers/staging/rtl8712/rtl871x_mp_ioctl.h +++ b/drivers/staging/rtl8712/rtl871x_mp_ioctl.h | |||
@@ -281,23 +281,23 @@ enum MP_MODE { | |||
281 | MP_ERR_MODE | 281 | MP_ERR_MODE |
282 | }; | 282 | }; |
283 | 283 | ||
284 | struct rwreg_param{ | 284 | struct rwreg_param { |
285 | unsigned int offset; | 285 | unsigned int offset; |
286 | unsigned int width; | 286 | unsigned int width; |
287 | unsigned int value; | 287 | unsigned int value; |
288 | }; | 288 | }; |
289 | 289 | ||
290 | struct bbreg_param{ | 290 | struct bbreg_param { |
291 | unsigned int offset; | 291 | unsigned int offset; |
292 | unsigned int phymask; | 292 | unsigned int phymask; |
293 | unsigned int value; | 293 | unsigned int value; |
294 | }; | 294 | }; |
295 | 295 | ||
296 | struct txpower_param{ | 296 | struct txpower_param { |
297 | unsigned int pwr_index; | 297 | unsigned int pwr_index; |
298 | }; | 298 | }; |
299 | 299 | ||
300 | struct datarate_param{ | 300 | struct datarate_param { |
301 | unsigned int rate_index; | 301 | unsigned int rate_index; |
302 | }; | 302 | }; |
303 | 303 | ||
@@ -321,7 +321,7 @@ struct mp_ioctl_handler { | |||
321 | unsigned int oid; | 321 | unsigned int oid; |
322 | }; | 322 | }; |
323 | 323 | ||
324 | struct mp_ioctl_param{ | 324 | struct mp_ioctl_param { |
325 | unsigned int subcode; | 325 | unsigned int subcode; |
326 | unsigned int len; | 326 | unsigned int len; |
327 | unsigned char data[0]; | 327 | unsigned char data[0]; |
diff --git a/drivers/staging/rtl8712/rtl871x_recv.h b/drivers/staging/rtl8712/rtl871x_recv.h index bf8115dbcb6..cc7a72fee1c 100644 --- a/drivers/staging/rtl8712/rtl871x_recv.h +++ b/drivers/staging/rtl8712/rtl871x_recv.h | |||
@@ -19,9 +19,9 @@ | |||
19 | /* for Rx reordering buffer control */ | 19 | /* for Rx reordering buffer control */ |
20 | struct recv_reorder_ctrl { | 20 | struct recv_reorder_ctrl { |
21 | struct _adapter *padapter; | 21 | struct _adapter *padapter; |
22 | u16 indicate_seq;/* =wstart_b, init_value=0xffff */ | 22 | u16 indicate_seq; /* =wstart_b, init_value=0xffff */ |
23 | u16 wend_b; | 23 | u16 wend_b; |
24 | u8 wsize_b; | 24 | u8 wsize_b; |
25 | struct __queue pending_recvframe_queue; | 25 | struct __queue pending_recvframe_queue; |
26 | struct timer_list reordering_ctrl_timer; | 26 | struct timer_list reordering_ctrl_timer; |
27 | }; | 27 | }; |
diff --git a/drivers/staging/rtl8712/rtl871x_rf.h b/drivers/staging/rtl8712/rtl871x_rf.h index c709d8cadf0..6c54966f13f 100644 --- a/drivers/staging/rtl8712/rtl871x_rf.h +++ b/drivers/staging/rtl8712/rtl871x_rf.h | |||
@@ -22,7 +22,7 @@ struct regulatory_class { | |||
22 | u8 modem; | 22 | u8 modem; |
23 | }; | 23 | }; |
24 | 24 | ||
25 | enum _REG_PREAMBLE_MODE{ | 25 | enum _REG_PREAMBLE_MODE { |
26 | PREAMBLE_LONG = 1, | 26 | PREAMBLE_LONG = 1, |
27 | PREAMBLE_AUTO = 2, | 27 | PREAMBLE_AUTO = 2, |
28 | PREAMBLE_SHORT = 3, | 28 | PREAMBLE_SHORT = 3, |
diff --git a/drivers/staging/rtl8712/rtl871x_security.h b/drivers/staging/rtl8712/rtl871x_security.h index 782b70a352f..bff71d2aae9 100644 --- a/drivers/staging/rtl8712/rtl871x_security.h +++ b/drivers/staging/rtl8712/rtl871x_security.h | |||
@@ -21,30 +21,31 @@ | |||
21 | #ifndef Ndis802_11AuthModeWPA2PSK | 21 | #ifndef Ndis802_11AuthModeWPA2PSK |
22 | #define Ndis802_11AuthModeWPA2PSK (Ndis802_11AuthModeWPANone + 2) | 22 | #define Ndis802_11AuthModeWPA2PSK (Ndis802_11AuthModeWPANone + 2) |
23 | #endif | 23 | #endif |
24 | |||
24 | union pn48 { | 25 | union pn48 { |
25 | u64 val; | 26 | u64 val; |
26 | #if defined(__BIG_ENDIAN) | 27 | #if defined(__BIG_ENDIAN) |
27 | struct { | 28 | struct { |
28 | u8 TSC7; | 29 | u8 TSC7; |
29 | u8 TSC6; | 30 | u8 TSC6; |
30 | u8 TSC5; | 31 | u8 TSC5; |
31 | u8 TSC4; | 32 | u8 TSC4; |
32 | u8 TSC3; | 33 | u8 TSC3; |
33 | u8 TSC2; | 34 | u8 TSC2; |
34 | u8 TSC1; | 35 | u8 TSC1; |
35 | u8 TSC0; | 36 | u8 TSC0; |
36 | } _byte_; | 37 | } _byte_; |
37 | #else | 38 | #else |
38 | struct { | 39 | struct { |
39 | u8 TSC0; | 40 | u8 TSC0; |
40 | u8 TSC1; | 41 | u8 TSC1; |
41 | u8 TSC2; | 42 | u8 TSC2; |
42 | u8 TSC3; | 43 | u8 TSC3; |
43 | u8 TSC4; | 44 | u8 TSC4; |
44 | u8 TSC5; | 45 | u8 TSC5; |
45 | u8 TSC6; | 46 | u8 TSC6; |
46 | u8 TSC7; | 47 | u8 TSC7; |
47 | } _byte_; | 48 | } _byte_; |
48 | #endif | 49 | #endif |
49 | }; | 50 | }; |
50 | 51 | ||
@@ -174,11 +175,11 @@ struct mic_data { | |||
174 | }; | 175 | }; |
175 | 176 | ||
176 | void seccalctkipmic( | 177 | void seccalctkipmic( |
177 | u8 *key, | 178 | u8 *key, |
178 | u8 *header, | 179 | u8 *header, |
179 | u8 *data, | 180 | u8 *data, |
180 | u32 data_len, | 181 | u32 data_len, |
181 | u8 *Miccode, | 182 | u8 *Miccode, |
182 | u8 priority); | 183 | u8 priority); |
183 | 184 | ||
184 | void r8712_secmicsetkey(struct mic_data *pmicdata, u8 * key); | 185 | void r8712_secmicsetkey(struct mic_data *pmicdata, u8 * key); |
diff --git a/drivers/staging/rtl8712/rtl871x_xmit.h b/drivers/staging/rtl8712/rtl871x_xmit.h index d518ce85585..df13e67b3eb 100644 --- a/drivers/staging/rtl8712/rtl871x_xmit.h +++ b/drivers/staging/rtl8712/rtl871x_xmit.h | |||
@@ -244,7 +244,8 @@ sint r8712_update_attrib(struct _adapter *padapter, _pkt *pkt, | |||
244 | struct pkt_attrib *pattrib); | 244 | struct pkt_attrib *pattrib); |
245 | int r8712_txframes_sta_ac_pending(struct _adapter *padapter, | 245 | int r8712_txframes_sta_ac_pending(struct _adapter *padapter, |
246 | struct pkt_attrib *pattrib); | 246 | struct pkt_attrib *pattrib); |
247 | sint _r8712_init_xmit_priv(struct xmit_priv *pxmitpriv, struct _adapter *padapter); | 247 | sint _r8712_init_xmit_priv(struct xmit_priv *pxmitpriv, |
248 | struct _adapter *padapter); | ||
248 | void _free_xmit_priv(struct xmit_priv *pxmitpriv); | 249 | void _free_xmit_priv(struct xmit_priv *pxmitpriv); |
249 | void r8712_free_xmitframe_ex(struct xmit_priv *pxmitpriv, | 250 | void r8712_free_xmitframe_ex(struct xmit_priv *pxmitpriv, |
250 | struct xmit_frame *pxmitframe); | 251 | struct xmit_frame *pxmitframe); |
diff --git a/drivers/staging/rtl8712/wifi.h b/drivers/staging/rtl8712/wifi.h index 86d4b98e243..6032cdc6539 100644 --- a/drivers/staging/rtl8712/wifi.h +++ b/drivers/staging/rtl8712/wifi.h | |||
@@ -39,38 +39,35 @@ enum WIFI_FRAME_TYPE { | |||
39 | }; | 39 | }; |
40 | 40 | ||
41 | enum WIFI_FRAME_SUBTYPE { | 41 | enum WIFI_FRAME_SUBTYPE { |
42 | 42 | /* below is for mgt frame */ | |
43 | /* below is for mgt frame */ | 43 | WIFI_ASSOCREQ = (0 | WIFI_MGT_TYPE), |
44 | WIFI_ASSOCREQ = (0 | WIFI_MGT_TYPE), | 44 | WIFI_ASSOCRSP = (BIT(4) | WIFI_MGT_TYPE), |
45 | WIFI_ASSOCRSP = (BIT(4) | WIFI_MGT_TYPE), | 45 | WIFI_REASSOCREQ = (BIT(5) | WIFI_MGT_TYPE), |
46 | WIFI_REASSOCREQ = (BIT(5) | WIFI_MGT_TYPE), | 46 | WIFI_REASSOCRSP = (BIT(5) | BIT(4) | WIFI_MGT_TYPE), |
47 | WIFI_REASSOCRSP = (BIT(5) | BIT(4) | WIFI_MGT_TYPE), | 47 | WIFI_PROBEREQ = (BIT(6) | WIFI_MGT_TYPE), |
48 | WIFI_PROBEREQ = (BIT(6) | WIFI_MGT_TYPE), | 48 | WIFI_PROBERSP = (BIT(6) | BIT(4) | WIFI_MGT_TYPE), |
49 | WIFI_PROBERSP = (BIT(6) | BIT(4) | WIFI_MGT_TYPE), | 49 | WIFI_BEACON = (BIT(7) | WIFI_MGT_TYPE), |
50 | WIFI_BEACON = (BIT(7) | WIFI_MGT_TYPE), | 50 | WIFI_ATIM = (BIT(7) | BIT(4) | WIFI_MGT_TYPE), |
51 | WIFI_ATIM = (BIT(7) | BIT(4) | WIFI_MGT_TYPE), | 51 | WIFI_DISASSOC = (BIT(7) | BIT(5) | WIFI_MGT_TYPE), |
52 | WIFI_DISASSOC = (BIT(7) | BIT(5) | WIFI_MGT_TYPE), | 52 | WIFI_AUTH = (BIT(7) | BIT(5) | BIT(4) | WIFI_MGT_TYPE), |
53 | WIFI_AUTH = (BIT(7) | BIT(5) | BIT(4) | WIFI_MGT_TYPE), | 53 | WIFI_DEAUTH = (BIT(7) | BIT(6) | WIFI_MGT_TYPE), |
54 | WIFI_DEAUTH = (BIT(7) | BIT(6) | WIFI_MGT_TYPE), | 54 | WIFI_ACTION = (BIT(7) | BIT(6) | BIT(4) | WIFI_MGT_TYPE), |
55 | WIFI_ACTION = (BIT(7) | BIT(6) | BIT(4) | WIFI_MGT_TYPE), | 55 | /* below is for control frame */ |
56 | 56 | WIFI_PSPOLL = (BIT(7) | BIT(5) | WIFI_CTRL_TYPE), | |
57 | /* below is for control frame */ | 57 | WIFI_RTS = (BIT(7) | BIT(5) | BIT(4) | WIFI_CTRL_TYPE), |
58 | WIFI_PSPOLL = (BIT(7) | BIT(5) | WIFI_CTRL_TYPE), | 58 | WIFI_CTS = (BIT(7) | BIT(6) | WIFI_CTRL_TYPE), |
59 | WIFI_RTS = (BIT(7) | BIT(5) | BIT(4) | WIFI_CTRL_TYPE), | 59 | WIFI_ACK = (BIT(7) | BIT(6) | BIT(4) | WIFI_CTRL_TYPE), |
60 | WIFI_CTS = (BIT(7) | BIT(6) | WIFI_CTRL_TYPE), | 60 | WIFI_CFEND = (BIT(7) | BIT(6) | BIT(5) | WIFI_CTRL_TYPE), |
61 | WIFI_ACK = (BIT(7) | BIT(6) | BIT(4) | WIFI_CTRL_TYPE), | 61 | WIFI_CFEND_CFACK = (BIT(7) | BIT(6) | BIT(5) | BIT(4) | WIFI_CTRL_TYPE), |
62 | WIFI_CFEND = (BIT(7) | BIT(6) | BIT(5) | WIFI_CTRL_TYPE), | 62 | /* below is for data frame */ |
63 | WIFI_CFEND_CFACK = (BIT(7) | BIT(6) | BIT(5) | BIT(4) | WIFI_CTRL_TYPE), | 63 | WIFI_DATA = (0 | WIFI_DATA_TYPE), |
64 | 64 | WIFI_DATA_CFACK = (BIT(4) | WIFI_DATA_TYPE), | |
65 | /* below is for data frame */ | 65 | WIFI_DATA_CFPOLL = (BIT(5) | WIFI_DATA_TYPE), |
66 | WIFI_DATA = (0 | WIFI_DATA_TYPE), | 66 | WIFI_DATA_CFACKPOLL = (BIT(5) | BIT(4) | WIFI_DATA_TYPE), |
67 | WIFI_DATA_CFACK = (BIT(4) | WIFI_DATA_TYPE), | 67 | WIFI_DATA_NULL = (BIT(6) | WIFI_DATA_TYPE), |
68 | WIFI_DATA_CFPOLL = (BIT(5) | WIFI_DATA_TYPE), | 68 | WIFI_CF_ACK = (BIT(6) | BIT(4) | WIFI_DATA_TYPE), |
69 | WIFI_DATA_CFACKPOLL = (BIT(5) | BIT(4) | WIFI_DATA_TYPE), | 69 | WIFI_CF_POLL = (BIT(6) | BIT(5) | WIFI_DATA_TYPE), |
70 | WIFI_DATA_NULL = (BIT(6) | WIFI_DATA_TYPE), | 70 | WIFI_CF_ACKPOLL = (BIT(6) | BIT(5) | BIT(4) | WIFI_DATA_TYPE), |
71 | WIFI_CF_ACK = (BIT(6) | BIT(4) | WIFI_DATA_TYPE), | ||
72 | WIFI_CF_POLL = (BIT(6) | BIT(5) | WIFI_DATA_TYPE), | ||
73 | WIFI_CF_ACKPOLL = (BIT(6) | BIT(5) | BIT(4) | WIFI_DATA_TYPE), | ||
74 | }; | 71 | }; |
75 | 72 | ||
76 | enum WIFI_REASON_CODE { | 73 | enum WIFI_REASON_CODE { |
@@ -84,7 +81,6 @@ enum WIFI_REASON_CODE { | |||
84 | _RSON_CLS3_ = 7, | 81 | _RSON_CLS3_ = 7, |
85 | _RSON_DISAOC_STA_LEAVING_ = 8, | 82 | _RSON_DISAOC_STA_LEAVING_ = 8, |
86 | _RSON_ASOC_NOT_AUTH_ = 9, | 83 | _RSON_ASOC_NOT_AUTH_ = 9, |
87 | |||
88 | /* WPA reason */ | 84 | /* WPA reason */ |
89 | _RSON_INVALID_IE_ = 13, | 85 | _RSON_INVALID_IE_ = 13, |
90 | _RSON_MIC_FAILURE_ = 14, | 86 | _RSON_MIC_FAILURE_ = 14, |
@@ -97,7 +93,6 @@ enum WIFI_REASON_CODE { | |||
97 | _RSON_UNSUPPORT_RSNE_VER_ = 21, | 93 | _RSON_UNSUPPORT_RSNE_VER_ = 21, |
98 | _RSON_INVALID_RSNE_CAP_ = 22, | 94 | _RSON_INVALID_RSNE_CAP_ = 22, |
99 | _RSON_IEEE_802DOT1X_AUTH_FAIL_ = 23, | 95 | _RSON_IEEE_802DOT1X_AUTH_FAIL_ = 23, |
100 | |||
101 | /* below are Realtek definitions */ | 96 | /* below are Realtek definitions */ |
102 | _RSON_PMK_NOT_AVAILABLE_ = 24, | 97 | _RSON_PMK_NOT_AVAILABLE_ = 24, |
103 | }; | 98 | }; |
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h index 6d9295270f8..0d90e1f5b29 100644 --- a/drivers/staging/rtl8712/wlan_bssdef.h +++ b/drivers/staging/rtl8712/wlan_bssdef.h | |||
@@ -13,23 +13,23 @@ typedef unsigned char NDIS_802_11_RATES[NDIS_802_11_LENGTH_RATES]; | |||
13 | typedef unsigned char NDIS_802_11_RATES_EX[NDIS_802_11_LENGTH_RATES_EX]; | 13 | typedef unsigned char NDIS_802_11_RATES_EX[NDIS_802_11_LENGTH_RATES_EX]; |
14 | 14 | ||
15 | struct ndis_802_11_ssid { | 15 | struct ndis_802_11_ssid { |
16 | u32 SsidLength; | 16 | u32 SsidLength; |
17 | u8 Ssid[32]; | 17 | u8 Ssid[32]; |
18 | }; | 18 | }; |
19 | 19 | ||
20 | enum NDIS_802_11_NETWORK_TYPE { | 20 | enum NDIS_802_11_NETWORK_TYPE { |
21 | Ndis802_11FH, | 21 | Ndis802_11FH, |
22 | Ndis802_11DS, | 22 | Ndis802_11DS, |
23 | Ndis802_11OFDM5, | 23 | Ndis802_11OFDM5, |
24 | Ndis802_11OFDM24, | 24 | Ndis802_11OFDM24, |
25 | Ndis802_11NetworkTypeMax /* not a real type, defined as an upper bound */ | 25 | Ndis802_11NetworkTypeMax /* not a real type, defined as an upper bound*/ |
26 | }; | 26 | }; |
27 | 27 | ||
28 | struct NDIS_802_11_CONFIGURATION_FH { | 28 | struct NDIS_802_11_CONFIGURATION_FH { |
29 | u32 Length; /* Length of structure */ | 29 | u32 Length; /* Length of structure */ |
30 | u32 HopPattern; /* As defined by 802.11, MSB set */ | 30 | u32 HopPattern; /* As defined by 802.11, MSB set */ |
31 | u32 HopSet; /* to one if non-802.11 */ | 31 | u32 HopSet; /* to one if non-802.11 */ |
32 | u32 DwellTime; /* units are Kusec */ | 32 | u32 DwellTime; /* units are Kusec */ |
33 | }; | 33 | }; |
34 | 34 | ||
35 | /* | 35 | /* |
@@ -37,25 +37,25 @@ struct NDIS_802_11_CONFIGURATION_FH { | |||
37 | ODI Handler will convert the channel number to freq. number. | 37 | ODI Handler will convert the channel number to freq. number. |
38 | */ | 38 | */ |
39 | struct NDIS_802_11_CONFIGURATION { | 39 | struct NDIS_802_11_CONFIGURATION { |
40 | u32 Length; /* Length of structure */ | 40 | u32 Length; /* Length of structure */ |
41 | u32 BeaconPeriod; /* units are Kusec */ | 41 | u32 BeaconPeriod; /* units are Kusec */ |
42 | u32 ATIMWindow; /* units are Kusec */ | 42 | u32 ATIMWindow; /* units are Kusec */ |
43 | u32 DSConfig; /* Frequency, units are kHz */ | 43 | u32 DSConfig; /* Frequency, units are kHz */ |
44 | struct NDIS_802_11_CONFIGURATION_FH FHConfig; | 44 | struct NDIS_802_11_CONFIGURATION_FH FHConfig; |
45 | }; | 45 | }; |
46 | 46 | ||
47 | enum NDIS_802_11_NETWORK_INFRASTRUCTURE { | 47 | enum NDIS_802_11_NETWORK_INFRASTRUCTURE { |
48 | Ndis802_11IBSS, | 48 | Ndis802_11IBSS, |
49 | Ndis802_11Infrastructure, | 49 | Ndis802_11Infrastructure, |
50 | Ndis802_11AutoUnknown, | 50 | Ndis802_11AutoUnknown, |
51 | Ndis802_11InfrastructureMax, /* Not a real value, defined as upper bound */ | 51 | Ndis802_11InfrastructureMax, /*Not a real value,defined as upper bound*/ |
52 | Ndis802_11APMode | 52 | Ndis802_11APMode |
53 | }; | 53 | }; |
54 | 54 | ||
55 | struct NDIS_802_11_FIXED_IEs { | 55 | struct NDIS_802_11_FIXED_IEs { |
56 | u8 Timestamp[8]; | 56 | u8 Timestamp[8]; |
57 | u16 BeaconInterval; | 57 | u16 BeaconInterval; |
58 | u16 Capabilities; | 58 | u16 Capabilities; |
59 | }; | 59 | }; |
60 | 60 | ||
61 | /* | 61 | /* |
@@ -70,44 +70,44 @@ struct NDIS_802_11_FIXED_IEs { | |||
70 | */ | 70 | */ |
71 | 71 | ||
72 | struct ndis_wlan_bssid_ex { | 72 | struct ndis_wlan_bssid_ex { |
73 | u32 Length; | 73 | u32 Length; |
74 | unsigned char MacAddress[6]; | 74 | unsigned char MacAddress[6]; |
75 | u8 Reserved[2]; | 75 | u8 Reserved[2]; |
76 | struct ndis_802_11_ssid Ssid; | 76 | struct ndis_802_11_ssid Ssid; |
77 | u32 Privacy; | 77 | u32 Privacy; |
78 | s32 Rssi; | 78 | s32 Rssi; |
79 | enum NDIS_802_11_NETWORK_TYPE NetworkTypeInUse; | 79 | enum NDIS_802_11_NETWORK_TYPE NetworkTypeInUse; |
80 | struct NDIS_802_11_CONFIGURATION Configuration; | 80 | struct NDIS_802_11_CONFIGURATION Configuration; |
81 | enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode; | 81 | enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode; |
82 | NDIS_802_11_RATES_EX SupportedRates; | 82 | NDIS_802_11_RATES_EX SupportedRates; |
83 | u32 IELength; | 83 | u32 IELength; |
84 | /*(timestamp, beacon interval, and capability information) */ | 84 | /*(timestamp, beacon interval, and capability information) */ |
85 | u8 IEs[MAX_IE_SZ]; | 85 | u8 IEs[MAX_IE_SZ]; |
86 | }; | 86 | }; |
87 | 87 | ||
88 | enum NDIS_802_11_AUTHENTICATION_MODE { | 88 | enum NDIS_802_11_AUTHENTICATION_MODE { |
89 | Ndis802_11AuthModeOpen, | 89 | Ndis802_11AuthModeOpen, |
90 | Ndis802_11AuthModeShared, | 90 | Ndis802_11AuthModeShared, |
91 | Ndis802_11AuthModeAutoSwitch, | 91 | Ndis802_11AuthModeAutoSwitch, |
92 | Ndis802_11AuthModeWPA, | 92 | Ndis802_11AuthModeWPA, |
93 | Ndis802_11AuthModeWPAPSK, | 93 | Ndis802_11AuthModeWPAPSK, |
94 | Ndis802_11AuthModeWPANone, | 94 | Ndis802_11AuthModeWPANone, |
95 | Ndis802_11AuthModeMax /* Not a real mode, defined as upper bound */ | 95 | Ndis802_11AuthModeMax /* Not a real mode, defined as upper bound */ |
96 | }; | 96 | }; |
97 | 97 | ||
98 | enum { | 98 | enum { |
99 | Ndis802_11WEPEnabled, | 99 | Ndis802_11WEPEnabled, |
100 | Ndis802_11Encryption1Enabled = Ndis802_11WEPEnabled, | 100 | Ndis802_11Encryption1Enabled = Ndis802_11WEPEnabled, |
101 | Ndis802_11WEPDisabled, | 101 | Ndis802_11WEPDisabled, |
102 | Ndis802_11EncryptionDisabled = Ndis802_11WEPDisabled, | 102 | Ndis802_11EncryptionDisabled = Ndis802_11WEPDisabled, |
103 | Ndis802_11WEPKeyAbsent, | 103 | Ndis802_11WEPKeyAbsent, |
104 | Ndis802_11Encryption1KeyAbsent = Ndis802_11WEPKeyAbsent, | 104 | Ndis802_11Encryption1KeyAbsent = Ndis802_11WEPKeyAbsent, |
105 | Ndis802_11WEPNotSupported, | 105 | Ndis802_11WEPNotSupported, |
106 | Ndis802_11EncryptionNotSupported = Ndis802_11WEPNotSupported, | 106 | Ndis802_11EncryptionNotSupported = Ndis802_11WEPNotSupported, |
107 | Ndis802_11Encryption2Enabled, | 107 | Ndis802_11Encryption2Enabled, |
108 | Ndis802_11Encryption2KeyAbsent, | 108 | Ndis802_11Encryption2KeyAbsent, |
109 | Ndis802_11Encryption3Enabled, | 109 | Ndis802_11Encryption3Enabled, |
110 | Ndis802_11Encryption3KeyAbsent | 110 | Ndis802_11Encryption3KeyAbsent |
111 | }; | 111 | }; |
112 | 112 | ||
113 | #define NDIS_802_11_AI_REQFI_CAPABILITIES 1 | 113 | #define NDIS_802_11_AI_REQFI_CAPABILITIES 1 |
@@ -119,51 +119,51 @@ enum { | |||
119 | #define NDIS_802_11_AI_RESFI_ASSOCIATIONID 4 | 119 | #define NDIS_802_11_AI_RESFI_ASSOCIATIONID 4 |
120 | 120 | ||
121 | struct NDIS_802_11_AI_REQFI { | 121 | struct NDIS_802_11_AI_REQFI { |
122 | u16 Capabilities; | 122 | u16 Capabilities; |
123 | u16 ListenInterval; | 123 | u16 ListenInterval; |
124 | unsigned char CurrentAPAddress[6]; | 124 | unsigned char CurrentAPAddress[6]; |
125 | }; | 125 | }; |
126 | 126 | ||
127 | struct NDIS_802_11_AI_RESFI { | 127 | struct NDIS_802_11_AI_RESFI { |
128 | u16 Capabilities; | 128 | u16 Capabilities; |
129 | u16 StatusCode; | 129 | u16 StatusCode; |
130 | u16 AssociationId; | 130 | u16 AssociationId; |
131 | }; | 131 | }; |
132 | 132 | ||
133 | struct NDIS_802_11_ASSOCIATION_INFORMATION { | 133 | struct NDIS_802_11_ASSOCIATION_INFORMATION { |
134 | u32 Length; | 134 | u32 Length; |
135 | u16 AvailableRequestFixedIEs; | 135 | u16 AvailableRequestFixedIEs; |
136 | struct NDIS_802_11_AI_REQFI RequestFixedIEs; | 136 | struct NDIS_802_11_AI_REQFI RequestFixedIEs; |
137 | u32 RequestIELength; | 137 | u32 RequestIELength; |
138 | u32 OffsetRequestIEs; | 138 | u32 OffsetRequestIEs; |
139 | u16 AvailableResponseFixedIEs; | 139 | u16 AvailableResponseFixedIEs; |
140 | struct NDIS_802_11_AI_RESFI ResponseFixedIEs; | 140 | struct NDIS_802_11_AI_RESFI ResponseFixedIEs; |
141 | u32 ResponseIELength; | 141 | u32 ResponseIELength; |
142 | u32 OffsetResponseIEs; | 142 | u32 OffsetResponseIEs; |
143 | }; | 143 | }; |
144 | 144 | ||
145 | /* Key mapping keys require a BSSID*/ | 145 | /* Key mapping keys require a BSSID*/ |
146 | struct NDIS_802_11_KEY { | 146 | struct NDIS_802_11_KEY { |
147 | u32 Length; /* Length of this structure */ | 147 | u32 Length; /* Length of this structure */ |
148 | u32 KeyIndex; | 148 | u32 KeyIndex; |
149 | u32 KeyLength; /* length of key in bytes */ | 149 | u32 KeyLength; /* length of key in bytes */ |
150 | unsigned char BSSID[6]; | 150 | unsigned char BSSID[6]; |
151 | unsigned long long KeyRSC; | 151 | unsigned long long KeyRSC; |
152 | u8 KeyMaterial[32]; /* variable length */ | 152 | u8 KeyMaterial[32]; /* variable length */ |
153 | }; | 153 | }; |
154 | 154 | ||
155 | struct NDIS_802_11_REMOVE_KEY { | 155 | struct NDIS_802_11_REMOVE_KEY { |
156 | u32 Length; /* Length of this structure */ | 156 | u32 Length; /* Length of this structure */ |
157 | u32 KeyIndex; | 157 | u32 KeyIndex; |
158 | unsigned char BSSID[6]; | 158 | unsigned char BSSID[6]; |
159 | }; | 159 | }; |
160 | 160 | ||
161 | struct NDIS_802_11_WEP { | 161 | struct NDIS_802_11_WEP { |
162 | u32 Length; /* Length of this structure */ | 162 | u32 Length; /* Length of this structure */ |
163 | u32 KeyIndex; /* 0 is the per-client key, | 163 | u32 KeyIndex; /* 0 is the per-client key, |
164 | * 1-N are the global keys */ | 164 | * 1-N are the global keys */ |
165 | u32 KeyLength; /* length of key in bytes */ | 165 | u32 KeyLength; /* length of key in bytes */ |
166 | u8 KeyMaterial[16];/* variable length depending on above field */ | 166 | u8 KeyMaterial[16]; /* variable length depending on above field */ |
167 | }; | 167 | }; |
168 | 168 | ||
169 | /* mask for authentication/integrity fields */ | 169 | /* mask for authentication/integrity fields */ |
@@ -192,15 +192,15 @@ struct wlan_network { | |||
192 | }; | 192 | }; |
193 | 193 | ||
194 | enum VRTL_CARRIER_SENSE { | 194 | enum VRTL_CARRIER_SENSE { |
195 | DISABLE_VCS, | 195 | DISABLE_VCS, |
196 | ENABLE_VCS, | 196 | ENABLE_VCS, |
197 | AUTO_VCS | 197 | AUTO_VCS |
198 | }; | 198 | }; |
199 | 199 | ||
200 | enum VCS_TYPE { | 200 | enum VCS_TYPE { |
201 | NONE_VCS, | 201 | NONE_VCS, |
202 | RTS_CTS, | 202 | RTS_CTS, |
203 | CTS_TO_SELF | 203 | CTS_TO_SELF |
204 | }; | 204 | }; |
205 | 205 | ||
206 | #define PWR_CAM 0 | 206 | #define PWR_CAM 0 |
@@ -211,9 +211,9 @@ enum VCS_TYPE { | |||
211 | 211 | ||
212 | enum UAPSD_MAX_SP { | 212 | enum UAPSD_MAX_SP { |
213 | NO_LIMIT, | 213 | NO_LIMIT, |
214 | TWO_MSDU, | 214 | TWO_MSDU, |
215 | FOUR_MSDU, | 215 | FOUR_MSDU, |
216 | SIX_MSDU | 216 | SIX_MSDU |
217 | }; | 217 | }; |
218 | 218 | ||
219 | #define NUM_PRE_AUTH_KEY 16 | 219 | #define NUM_PRE_AUTH_KEY 16 |
@@ -223,18 +223,18 @@ enum UAPSD_MAX_SP { | |||
223 | * WPA2 | 223 | * WPA2 |
224 | */ | 224 | */ |
225 | struct wlan_bssid_ex { | 225 | struct wlan_bssid_ex { |
226 | u32 Length; | 226 | u32 Length; |
227 | unsigned char MacAddress[6]; | 227 | unsigned char MacAddress[6]; |
228 | u8 Reserved[2]; | 228 | u8 Reserved[2]; |
229 | struct ndis_802_11_ssid Ssid; | 229 | struct ndis_802_11_ssid Ssid; |
230 | u32 Privacy; | 230 | u32 Privacy; |
231 | s32 Rssi; | 231 | s32 Rssi; |
232 | enum NDIS_802_11_NETWORK_TYPE NetworkTypeInUse; | 232 | enum NDIS_802_11_NETWORK_TYPE NetworkTypeInUse; |
233 | struct NDIS_802_11_CONFIGURATION Configuration; | 233 | struct NDIS_802_11_CONFIGURATION Configuration; |
234 | enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode; | 234 | enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode; |
235 | NDIS_802_11_RATES_EX SupportedRates; | 235 | NDIS_802_11_RATES_EX SupportedRates; |
236 | u32 IELength; | 236 | u32 IELength; |
237 | u8 IEs[MAX_IE_SZ]; /* (timestamp, beacon interval, and capability | 237 | u8 IEs[MAX_IE_SZ]; /* (timestamp, beacon interval, and capability |
238 | * information) */ | 238 | * information) */ |
239 | }; | 239 | }; |
240 | 240 | ||