diff options
author | Kalle Valo <kvalo@codeaurora.org> | 2015-06-15 13:25:32 +0300 |
---|---|---|
committer | Kalle Valo <kvalo@codeaurora.org> | 2015-06-15 13:25:32 +0300 |
commit | d9378080a12ba314476fcccf4ce1328794e4e230 (patch) | |
tree | 78640c772386f691e927a1ec86694a3292e0adcc /drivers/net/wireless/ath/ath6kl | |
parent | ed8e0ed53b317f72df907298fb653a976b083dc4 (diff) | |
parent | 3e2d8e1b82af3e67c8d369f3c006b8f882399742 (diff) | |
download | linux-d9378080a12ba314476fcccf4ce1328794e4e230.tar.xz |
Merge ath-next from ath.git
Major changes:
wil6210:
* add modparam for bcast ring size
* support hidden SSID
* add per-MCS Rx stats
Diffstat (limited to 'drivers/net/wireless/ath/ath6kl')
-rw-r--r-- | drivers/net/wireless/ath/ath6kl/wmi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.h b/drivers/net/wireless/ath/ath6kl/wmi.h index 19f88b4a24fb..05d25a94c781 100644 --- a/drivers/net/wireless/ath/ath6kl/wmi.h +++ b/drivers/net/wireless/ath/ath6kl/wmi.h @@ -1527,8 +1527,8 @@ struct wmi_connect_event { __le32 nw_type; } sta; struct { - u8 phymode; u8 aid; + u8 phymode; u8 mac_addr[ETH_ALEN]; u8 auth; u8 keymgmt; |