aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/dev.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/libertas/dev.h')
-rw-r--r--drivers/net/wireless/libertas/dev.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index 27e81fd97c94..f9ec69e04734 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -101,6 +101,7 @@ struct lbs_mesh_stats {
101/** Private structure for the MV device */ 101/** Private structure for the MV device */
102struct lbs_private { 102struct lbs_private {
103 int mesh_open; 103 int mesh_open;
104 int mesh_fw_ver;
104 int infra_open; 105 int infra_open;
105 int mesh_autostart_enabled; 106 int mesh_autostart_enabled;
106 107
@@ -337,7 +338,7 @@ struct bss_descriptor {
337 u32 rssi; 338 u32 rssi;
338 u32 channel; 339 u32 channel;
339 u16 beaconperiod; 340 u16 beaconperiod;
340 u32 atimwindow; 341 __le16 atimwindow;
341 342
342 /* IW_MODE_AUTO, IW_MODE_ADHOC, IW_MODE_INFRA */ 343 /* IW_MODE_AUTO, IW_MODE_ADHOC, IW_MODE_INFRA */
343 u8 mode; 344 u8 mode;
@@ -347,10 +348,10 @@ struct bss_descriptor {
347 348
348 unsigned long last_scanned; 349 unsigned long last_scanned;
349 350
350 union ieeetypes_phyparamset phyparamset; 351 union ieee_phy_param_set phy;
351 union IEEEtypes_ssparamset ssparamset; 352 union ieee_ss_param_set ss;
352 353
353 struct ieeetypes_countryinfofullset countryinfo; 354 struct ieee_ie_country_info_full_set countryinfo;
354 355
355 u8 wpa_ie[MAX_WPA_IE_LEN]; 356 u8 wpa_ie[MAX_WPA_IE_LEN];
356 size_t wpa_ie_len; 357 size_t wpa_ie_len;