diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2016-04-07 20:44:37 +0200 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2016-04-07 20:44:37 +0200 |
| commit | 20ac1b325d8d526211b1276ecf9b64b7e8369f50 (patch) | |
| tree | be1ba1632c74adf873f505cb1251ee07ab6fbdd4 /include | |
| parent | mwifiex: dump pcie scratch registers (diff) | |
| parent | ath10k: fix unconditional num_mpdus_ready subtraction (diff) | |
| download | linux-20ac1b325d8d526211b1276ecf9b64b7e8369f50.tar.xz linux-20ac1b325d8d526211b1276ecf9b64b7e8369f50.zip | |
Merge ath-next from ath.git
ath.git patches for 4.7. Major changes:
ath10k
* implement push-pull tx model using mac80211 software queuing support
* enable scan in AP mode (NL80211_FEATURE_AP_SCAN)
wil6210
* add basic PBSS (Personal Basic Service Set) support
* add initial P2P support
* add oob_mode module parameter
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ath9k_platform.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/ath9k_platform.h b/include/linux/ath9k_platform.h index 33eb274cd0e6..e66153d60bd5 100644 --- a/include/linux/ath9k_platform.h +++ b/include/linux/ath9k_platform.h @@ -31,6 +31,10 @@ struct ath9k_platform_data { u32 gpio_mask; u32 gpio_val; + u32 bt_active_pin; + u32 bt_priority_pin; + u32 wlan_active_pin; + bool endian_check; bool is_clk_25mhz; bool tx_gain_buffalo; |