2 files changed, 13 insertions, 4 deletions

diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index 7e25164adfe9..129b7b087148 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -1515,6 +1515,11 @@ enum nl80211_commands {
  *      to react to radar events, e.g. initiate a channel switch or leave the
  *      IBSS network.
  *
+ * @NL80211_ATTR_SUPPORT_5_MHZ: A flag indicating that the device supports
+ *      5 MHz channel bandwidth.
+ * @NL80211_ATTR_SUPPORT_10_MHZ: A flag indicating that the device supports
+ *      10 MHz channel bandwidth.
+ *
  * @NL80211_ATTR_MAX: highest attribute number currently defined
  * @__NL80211_ATTR_AFTER_LAST: internal use
  */
@@ -1831,6 +1836,9 @@ enum nl80211_attrs {
 
         NL80211_ATTR_HANDLE_DFS,
 
+        NL80211_ATTR_SUPPORT_5_MHZ,
+        NL80211_ATTR_SUPPORT_10_MHZ,
+
         /* add attributes here, update the policy in nl80211.c */
 
         __NL80211_ATTR_AFTER_LAST,
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 79632edebb6c..8c83fbb3824f 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -1228,10 +1228,6 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *dev,
                 if ((dev->wiphy.flags & WIPHY_FLAG_TDLS_EXTERNAL_SETUP) &&
                     nla_put_flag(msg, NL80211_ATTR_TDLS_EXTERNAL_SETUP))
                         goto nla_put_failure;
-                if ((dev->wiphy.flags & WIPHY_FLAG_SUPPORTS_5_10_MHZ) &&
-                    nla_put_flag(msg, WIPHY_FLAG_SUPPORTS_5_10_MHZ))
-                        goto nla_put_failure;
-
                 state->split_start++;
                 if (state->split)
                         break;
@@ -1560,6 +1556,11 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *dev,
                 if (nl80211_send_coalesce(msg, dev))
                         goto nla_put_failure;
 
+                if ((dev->wiphy.flags & WIPHY_FLAG_SUPPORTS_5_10_MHZ) &&
+                    (nla_put_flag(msg, NL80211_ATTR_SUPPORT_5_MHZ) ||
+                     nla_put_flag(msg, NL80211_ATTR_SUPPORT_10_MHZ)))
+                        goto nla_put_failure;
+
                 /* done */
                 state->split_start = 0;
                 break;