diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-08-22 14:28:50 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-08-22 14:28:50 -0400 |
| commit | b38d355eaa223e420d0c45ff7a3279ea811552c5 (patch) | |
| tree | 4a6b3341e1b8b72afdc19e3b9bfe8c40219c04aa /drivers/net/wireless/mwifiex/ioctl.h | |
| parent | ca1ba7caa68520864e4b9227e67f3bbc6fed373b (diff) | |
| parent | af2bf4b4ee58d262a9a5c1d4ce6f81835058f8b5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
drivers/staging/ath6kl/os/linux/ar6000_drv.c
Diffstat (limited to 'drivers/net/wireless/mwifiex/ioctl.h')
| -rw-r--r-- | drivers/net/wireless/mwifiex/ioctl.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/mwifiex/ioctl.h b/drivers/net/wireless/mwifiex/ioctl.h index f6bcc868562..e0b68e7c8ca 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 { |