diff options
Diffstat (limited to 'drivers/net/wireless/at76c50x-usb.h')
| -rw-r--r-- | drivers/net/wireless/at76c50x-usb.h | 28 | 
1 files changed, 15 insertions, 13 deletions
diff --git a/drivers/net/wireless/at76c50x-usb.h b/drivers/net/wireless/at76c50x-usb.h index 4a37447dfc0..55090a38ac9 100644 --- a/drivers/net/wireless/at76c50x-usb.h +++ b/drivers/net/wireless/at76c50x-usb.h @@ -219,18 +219,6 @@ struct at76_req_join {  	u8 reserved;  } __packed; -struct set_mib_buffer { -	u8 type; -	u8 size; -	u8 index; -	u8 reserved; -	union { -		u8 byte; -		__le16 word; -		u8 addr[ETH_ALEN]; -	} data; -} __packed; -  struct mib_local {  	u16 reserved0;  	u8 beacon_enable; @@ -290,7 +278,7 @@ struct mib_mac_mgmt {  	u8 res;  	u8 multi_domain_capability_implemented;  	u8 multi_domain_capability_enabled; -	u8 country_string[3]; +	u8 country_string[IEEE80211_COUNTRY_STRING_LEN];  	u8 reserved[3];  } __packed; @@ -334,6 +322,19 @@ struct mib_mdomain {  	u8 channel_list[14];	/* 0 for invalid channels */  } __packed; +struct set_mib_buffer { +	u8 type; +	u8 size; +	u8 index; +	u8 reserved; +	union { +		u8 byte; +		__le16 word; +		u8 addr[ETH_ALEN]; +		struct mib_mac_wep wep_mib; +	} data; +} __packed; +  struct at76_fw_header {  	__le32 crc;		/* CRC32 of the whole image */  	__le32 board_type;	/* firmware compatibility code */ @@ -417,6 +418,7 @@ struct at76_priv {  	int scan_max_time;	/* scan max channel time */  	int scan_mode;		/* SCAN_TYPE_ACTIVE, SCAN_TYPE_PASSIVE */  	int scan_need_any;	/* if set, need to scan for any ESSID */ +	bool scanning;		/* if set, the scan is running */  	u16 assoc_id;		/* current association ID, if associated */  | 
