nl80211: support setting S1G channels

[linux-block.git] / net / wireless / chan.c

diff --git a/net/wireless/chan.c b/net/wireless/chan.c
index 6a6f2f214c10f11b4d6341ed6e533f7c846695d3..96e24ee4c7e8c1af5d8cb5b994da0049f8ca32fc 100644 (file)
--- a/net/wireless/chan.c
+++ b/net/wireless/chan.c
@@ -141,9 +141,62 @@ static bool cfg80211_edmg_chandef_valid(const struct cfg80211_chan_def *chandef)
        return true;
 }
 
+static int nl80211_chan_width_to_mhz(enum nl80211_chan_width chan_width)
+{
+       int mhz;
+
+       switch (chan_width) {
+       case NL80211_CHAN_WIDTH_1:
+               mhz = 1;
+               break;
+       case NL80211_CHAN_WIDTH_2:
+               mhz = 2;
+               break;
+       case NL80211_CHAN_WIDTH_4:
+               mhz = 4;
+               break;
+       case NL80211_CHAN_WIDTH_8:
+               mhz = 8;
+               break;
+       case NL80211_CHAN_WIDTH_16:
+               mhz = 16;
+               break;
+       case NL80211_CHAN_WIDTH_5:
+               mhz = 5;
+               break;
+       case NL80211_CHAN_WIDTH_10:
+               mhz = 10;
+               break;
+       case NL80211_CHAN_WIDTH_20:
+       case NL80211_CHAN_WIDTH_20_NOHT:
+               mhz = 20;
+               break;
+       case NL80211_CHAN_WIDTH_40:
+               mhz = 40;
+               break;
+       case NL80211_CHAN_WIDTH_80P80:
+       case NL80211_CHAN_WIDTH_80:
+               mhz = 80;
+               break;
+       case NL80211_CHAN_WIDTH_160:
+               mhz = 160;
+               break;
+       default:
+               WARN_ON_ONCE(1);
+               return -1;
+       }
+       return mhz;
+}
+
+static int cfg80211_chandef_get_width(const struct cfg80211_chan_def *c)
+{
+       return nl80211_chan_width_to_mhz(c->width);
+}
+
 bool cfg80211_chandef_valid(const struct cfg80211_chan_def *chandef)
 {
-       u32 control_freq;
+       u32 control_freq, oper_freq;
+       int oper_width, control_width;
 
        if (!chandef->chan)
                return false;
@@ -155,10 +208,6 @@ bool cfg80211_chandef_valid(const struct cfg80211_chan_def *chandef)
 
        switch (chandef->width) {
        case NL80211_CHAN_WIDTH_1:
-       case NL80211_CHAN_WIDTH_2:
-       case NL80211_CHAN_WIDTH_4:
-       case NL80211_CHAN_WIDTH_8:
-       case NL80211_CHAN_WIDTH_16:
        case NL80211_CHAN_WIDTH_5:
        case NL80211_CHAN_WIDTH_10:
        case NL80211_CHAN_WIDTH_20:
@@ -169,6 +218,30 @@ bool cfg80211_chandef_valid(const struct cfg80211_chan_def *chandef)
                if (chandef->center_freq2)
                        return false;
                break;
+       case NL80211_CHAN_WIDTH_2:
+       case NL80211_CHAN_WIDTH_4:
+       case NL80211_CHAN_WIDTH_8:
+       case NL80211_CHAN_WIDTH_16:
+               control_freq = ieee80211_channel_to_khz(chandef->chan);
+               oper_freq = ieee80211_chandef_to_khz(chandef);
+               control_width = nl80211_chan_width_to_mhz(
+                                       ieee80211_s1g_channel_width(
+                                                               chandef->chan));
+               oper_width = cfg80211_chandef_get_width(chandef);
+
+               if (oper_width < 0 || control_width < 0)
+                       return false;
+               if (chandef->center_freq2)
+                       return false;
+
+               if (control_freq + MHZ_TO_KHZ(control_width) / 2 >
+                   oper_freq + MHZ_TO_KHZ(oper_width) / 2)
+                       return false;
+
+               if (control_freq - MHZ_TO_KHZ(control_width) / 2 <
+                   oper_freq - MHZ_TO_KHZ(oper_width) / 2)
+                       return false;
+               break;
        case NL80211_CHAN_WIDTH_40:
                if (chandef->center_freq1 != control_freq + 10 &&
                    chandef->center_freq1 != control_freq - 10)
@@ -264,53 +337,6 @@ static void chandef_primary_freqs(const struct cfg80211_chan_def *c,
        }
 }
 
-static int cfg80211_chandef_get_width(const struct cfg80211_chan_def *c)
-{
-       int width;
-
-       switch (c->width) {
-       case NL80211_CHAN_WIDTH_1:
-               width = 1;
-               break;
-       case NL80211_CHAN_WIDTH_2:
-               width = 2;
-               break;
-       case NL80211_CHAN_WIDTH_4:
-               width = 4;
-               break;
-       case NL80211_CHAN_WIDTH_8:
-               width = 8;
-               break;
-       case NL80211_CHAN_WIDTH_16:
-               width = 16;
-               break;
-       case NL80211_CHAN_WIDTH_5:
-               width = 5;
-               break;
-       case NL80211_CHAN_WIDTH_10:
-               width = 10;
-               break;
-       case NL80211_CHAN_WIDTH_20:
-       case NL80211_CHAN_WIDTH_20_NOHT:
-               width = 20;
-               break;
-       case NL80211_CHAN_WIDTH_40:
-               width = 40;
-               break;
-       case NL80211_CHAN_WIDTH_80P80:
-       case NL80211_CHAN_WIDTH_80:
-               width = 80;
-               break;
-       case NL80211_CHAN_WIDTH_160:
-               width = 160;
-               break;
-       default:
-               WARN_ON_ONCE(1);
-               return -1;
-       }
-       return width;
-}
-
 const struct cfg80211_chan_def *
 cfg80211_chandef_compatible(const struct cfg80211_chan_def *c1,
                            const struct cfg80211_chan_def *c2)