2 files changed, 9 insertions, 0 deletions

diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index 05ba3539b77e..c01423888db9 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -453,6 +453,9 @@ enum nl80211_commands {
  *      attributes consists of a nested attribute containing
  *      NL80211_FREQUENCY_ATTR_*
  *
+ * @NL80211_ATTR_CIPHER_SUITES: a set of u32 values indicating the supported
+ *      cipher suites
+ *
  * @NL80211_ATTR_MAX: highest attribute number currently defined
  * @__NL80211_ATTR_AFTER_LAST: internal use
  */
@@ -540,6 +543,7 @@ enum nl80211_attrs {
         NL80211_ATTR_KEY_TYPE,
 
         NL80211_ATTR_MAX_SCAN_IE_LEN,
+        NL80211_ATTR_CIPHER_SUITES,
 
         NL80211_ATTR_FREQ_BEFORE,
         NL80211_ATTR_FREQ_AFTER,
diff --git a/include/net/wireless.h b/include/net/wireless.h
index 2bcdeda46d81..44c2642d3c06 100644
--- a/include/net/wireless.h
+++ b/include/net/wireless.h
@@ -205,6 +205,8 @@ struct ieee80211_supported_band {
  *      on the reg_notifier() if it chooses to ignore future
  *      regulatory domain changes caused by other drivers.
  * @signal_type: signal type reported in &struct cfg80211_bss.
+ * @cipher_suites: supported cipher suites
+ * @n_cipher_suites: number of supported cipher suites
  */
 struct wiphy {
         /* assign these fields before you register the wiphy */
@@ -224,6 +226,9 @@ struct wiphy {
         u8 max_scan_ssids;
         u16 max_scan_ie_len;
 
+        int n_cipher_suites;
+        const u32 *cipher_suites;
+
         /* If multiple wiphys are registered and you're handed e.g.
          * a regular netdev with assigned ieee80211_ptr, you won't
          * know whether it points to a wiphy your driver has registered