diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2015-05-29 12:36:29 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2015-05-29 12:40:15 -0700 |
| commit | b1e52102c211357f585e9ff6d54501e90254326e (patch) | |
| tree | 1e04b17ec4a5a2b3019a23229da603f58f4aec19 /src/common | |
| parent | 8bd70b7d6ba220544ee2f0e201e5df23e277fa1d (diff) | |
| download | android_external_wpa_supplicant_8-b1e52102c211357f585e9ff6d54501e90254326e.tar.gz android_external_wpa_supplicant_8-b1e52102c211357f585e9ff6d54501e90254326e.tar.bz2 android_external_wpa_supplicant_8-b1e52102c211357f585e9ff6d54501e90254326e.zip | |
Cumulative patch from commit dc1a341dec54c28c3351ee7edab9ccaf7b68861f
dc1a341 P2P: Add manufacturer info into D-Bus peer interface
3330395 P2P: Add P2P Cancel method over D-Bus interface
87d3c62 WPS: Add WPS Cancel method over D-Bus interface
eda9d84 P2P: Fix a potential memory leak in a P2P+NFC corner case
701d972 Add libwpa_client build option to use a dynamic library
ccad05a P2P: Restart group formation timer upon receiving new Inv Req
4d3be9c Postpone updating of wpa_s->current_bss till association event
3784c05 Extend hw_mode to support any band for offloaded ACS case
1b748e6 HS 2.0: hs20-client: Fix hostname extraction from URL
dba68f2 HS 2.0: Fix hs20_spp_server compile error
e4a43a9 HS 2.0: spp-client: Warn user if xml file cannot be found
Change-Id: If4acdda6f6e6a07bf87216d34b2c89486a4a3078
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/defs.h | 1 | ||||
| -rw-r--r-- | src/common/qca-vendor.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/common/defs.h b/src/common/defs.h index 24f80ad4..5b2d7c42 100644 --- a/src/common/defs.h +++ b/src/common/defs.h @@ -295,6 +295,7 @@ enum hostapd_hw_mode { HOSTAPD_MODE_IEEE80211G, HOSTAPD_MODE_IEEE80211A, HOSTAPD_MODE_IEEE80211AD, + HOSTAPD_MODE_IEEE80211ANY, NUM_HOSTAPD_MODES }; diff --git a/src/common/qca-vendor.h b/src/common/qca-vendor.h index 140295cf..3c35e796 100644 --- a/src/common/qca-vendor.h +++ b/src/common/qca-vendor.h @@ -221,6 +221,7 @@ enum qca_wlan_vendor_acs_hw_mode { QCA_ACS_MODE_IEEE80211G, QCA_ACS_MODE_IEEE80211A, QCA_ACS_MODE_IEEE80211AD, + QCA_ACS_MODE_IEEE80211ANY, }; /** @@ -230,10 +231,13 @@ enum qca_wlan_vendor_acs_hw_mode { * management offload, a mechanism where the station's firmware * does the exchange with the AP to establish the temporal keys * after roaming, rather than having the user space wpa_supplicant do it. + * @QCA_WLAN_VENDOR_FEATURE_SUPPORT_HW_MODE_ANY: Device supports automatic + * band selection based on channel selection results. * @NUM_QCA_WLAN_VENDOR_FEATURES: Number of assigned feature bits */ enum qca_wlan_vendor_features { QCA_WLAN_VENDOR_FEATURE_KEY_MGMT_OFFLOAD = 0, + QCA_WLAN_VENDOR_FEATURE_SUPPORT_HW_MODE_ANY = 1, NUM_QCA_WLAN_VENDOR_FEATURES /* keep last */ }; |