Cumulative patch from commit c41d0840a1ae4d755c525b091a4bf9d740efdb5f
c41d084 nl80211: Allow driver-based roam to change ESS
6ba7eba Add OpenSSL 0.9.8zf patch for EAP-FAST support
1de0710 atheros: Clear WPS appie during deinit
857d942 Extend offloaded ACS QCA vendor command to support VHT
0fd52a6 Remove duplicated wpa_s->conf->interworking check
ad44309 Add Extended Capabilities element to all Probe Request frames
9bd566a Delay AP selection if all networks are temporarily disabled
701f396 Don't optimize scan frequencies if selected network has changed
e9d2805 P2PS: Extend p2p_service_del asp to support 'all' parameter
6dd51ec P2PS: Add P2PS advertisements on ALL_SERVICES ANQP query
c40a891 P2PS: Delete ASP advertisements on wpas_p2p_service_flush
2dc422e P2PS: Update SD indicator value on ASP add/del/update
030a3e1 DFS: Fix range availability check
56ef992 DFS: Consider non-contiguous channels
6ceea4c Restart sched_scan on channel list change
e7a296b Remove unused shared_freq driver op
58e115b Fix hlr_auc_gw build with OpenSSL
5f9c92f nl80211: Fix vendor command handling
55e8f0e Fix CONFIG_EAP_UNAUTH_TLS without CONFIG_EAP_TLS build
9772af6 Interworking: Prevent scan during ANQP fetch and Interworking select
2c50246 Add a AP mode event message for possible PSK/passphrase mismatch
6784168 Remove SChannel support
Change-Id: I21078309f83821d4b685de77c517c0886b3366bd
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index 4074b87..6a9cd74 100644
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -1588,6 +1588,16 @@
/* Indicates whether HT40 is enabled */
int ht40_enabled;
+
+ /* Indicates whether VHT is enabled */
+ int vht_enabled;
+
+ /* Configured ACS channel width */
+ u16 ch_width;
+
+ /* ACS channel list info */
+ unsigned int ch_list_len;
+ const u8 *ch_list;
};
@@ -2657,18 +2667,6 @@
int encrypt);
/**
- * shared_freq - Get operating frequency of shared interface(s)
- * @priv: Private driver interface data
- * Returns: Operating frequency in MHz, 0 if no shared operation in
- * use, or -1 on failure
- *
- * This command can be used to request the current operating frequency
- * of any virtual interface that shares the same radio to provide
- * information for channel selection for other virtual interfaces.
- */
- int (*shared_freq)(void *priv);
-
- /**
* get_noa - Get current Notice of Absence attribute payload
* @priv: Private driver interface data
* @buf: Buffer for returning NoA
@@ -4558,10 +4556,18 @@
* struct acs_selected_channels - Data for EVENT_ACS_CHANNEL_SELECTED
* @pri_channel: Selected primary channel
* @sec_channel: Selected secondary channel
+ * @vht_seg0_center_ch: VHT mode Segment0 center channel
+ * @vht_seg1_center_ch: VHT mode Segment1 center channel
+ * @ch_width: Selected Channel width by driver. Driver may choose to
+ * change hostapd configured ACS channel width due driver internal
+ * channel restrictions.
*/
struct acs_selected_channels {
u8 pri_channel;
u8 sec_channel;
+ u8 vht_seg0_center_ch;
+ u8 vht_seg1_center_ch;
+ u16 ch_width;
} acs_selected_channels;
};