summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex/ioctl.h
diff options
context:
space:
mode:
authorAnton Vorontsov <cbouatmailru@gmail.com>2012-01-04 06:09:35 +0100
committerAnton Vorontsov <cbouatmailru@gmail.com>2012-01-04 06:09:35 +0100
commit251f39fe42dae863bd24e30864e6b66076ba076d (patch)
treec804944bc17f3836d19cc8b5bc611dd1fb0ea915 /drivers/net/wireless/mwifiex/ioctl.h
parentpower_supply: Add "unknown" in power supply type (diff)
parentpower_supply: add "powers" links to self-powered HID devices (diff)
downloadlinux-251f39fe42dae863bd24e30864e6b66076ba076d.tar.xz
linux-251f39fe42dae863bd24e30864e6b66076ba076d.zip
Merge branch 'power-supply-scope' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
Diffstat (limited to 'drivers/net/wireless/mwifiex/ioctl.h')
-rw-r--r--drivers/net/wireless/mwifiex/ioctl.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/mwifiex/ioctl.h b/drivers/net/wireless/mwifiex/ioctl.h
index f6bcc868562f..e0b68e7c8ca2 100644
--- a/drivers/net/wireless/mwifiex/ioctl.h
+++ b/drivers/net/wireless/mwifiex/ioctl.h
@@ -134,7 +134,6 @@ struct mwifiex_ver_ext {
struct mwifiex_bss_info {
u32 bss_mode;
struct mwifiex_802_11_ssid ssid;
- u32 scan_table_idx;
u32 bss_chan;
u32 region_code;
u32 media_connected;
@@ -307,10 +306,12 @@ struct mwifiex_ds_read_eeprom {
u8 value[MAX_EEPROM_DATA];
};
+#define IEEE_MAX_IE_SIZE 256
+
struct mwifiex_ds_misc_gen_ie {
u32 type;
u32 len;
- u8 ie_data[IW_CUSTOM_MAX];
+ u8 ie_data[IEEE_MAX_IE_SIZE];
};
struct mwifiex_ds_misc_cmd {