1 files changed, 44 insertions, 11 deletions

diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
index 889c3e93e0f4..e00ce8c3e28e 100644
--- a/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
@@ -3,6 +3,7 @@
  */
 
 #include <linux/nl80211.h>
+#include <net/cfg80211.h>
 #include "ieee80211_i.h"
 
 static enum ieee80211_chan_mode
@@ -20,23 +21,29 @@ __ieee80211_get_channel_mode(struct ieee80211_local *local,
                 if (!ieee80211_sdata_running(sdata))
                         continue;
 
-                if (sdata->vif.type == NL80211_IFTYPE_MONITOR)
+                switch (sdata->vif.type) {
+                case NL80211_IFTYPE_MONITOR:
                         continue;
-
-                if (sdata->vif.type == NL80211_IFTYPE_STATION &&
-                    !sdata->u.mgd.associated)
-                        continue;
-
-                if (sdata->vif.type == NL80211_IFTYPE_ADHOC) {
+                case NL80211_IFTYPE_STATION:
+                        if (!sdata->u.mgd.associated)
+                                continue;
+                        break;
+                case NL80211_IFTYPE_ADHOC:
                         if (!sdata->u.ibss.ssid_len)
                                 continue;
                         if (!sdata->u.ibss.fixed_channel)
                                 return CHAN_MODE_HOPPING;
-                }
-
-                if (sdata->vif.type == NL80211_IFTYPE_AP &&
-                    !sdata->u.ap.beacon)
+                        break;
+                case NL80211_IFTYPE_AP_VLAN:
+                        /* will also have _AP interface */
                         continue;
+                case NL80211_IFTYPE_AP:
+                        if (!sdata->u.ap.beacon)
+                                continue;
+                        break;
+                default:
+                        break;
+                }
 
                 return CHAN_MODE_FIXED;
         }
@@ -128,3 +135,29 @@ bool ieee80211_set_channel_type(struct ieee80211_local *local,
 
         return result;
 }
+
+/*
+ * ieee80211_get_tx_channel_type returns the channel type we should
+ * use for packet transmission, given the channel capability and
+ * whatever regulatory flags we have been given.
+ */
+enum nl80211_channel_type ieee80211_get_tx_channel_type(
+                                struct ieee80211_local *local,
+                                enum nl80211_channel_type channel_type)
+{
+        switch (channel_type) {
+        case NL80211_CHAN_HT40PLUS:
+                if (local->hw.conf.channel->flags &
+                                IEEE80211_CHAN_NO_HT40PLUS)
+                        return NL80211_CHAN_HT20;
+                break;
+        case NL80211_CHAN_HT40MINUS:
+                if (local->hw.conf.channel->flags &
+                                IEEE80211_CHAN_NO_HT40MINUS)
+                        return NL80211_CHAN_HT20;
+                break;
+        default:
+                break;
+        }
+        return channel_type;
+}