mediatek: filogic: add Adtran SmartRG Mount Stuart series

[openwrt/openwrt.git] / package / network / services / hostapd / patches / 011-mesh-Allow-DFS-channels-to-be-selected-if-dfs-is-ena.patch

diff --git a/package/network/services/hostapd/patches/011-mesh-Allow-DFS-channels-to-be-selected-if-dfs-is-ena.patch b/package/network/services/hostapd/patches/011-mesh-Allow-DFS-channels-to-be-selected-if-dfs-is-ena.patch
deleted file mode 100644 (file)
index 3a9b847..0000000
--- a/package/network/services/hostapd/patches/011-mesh-Allow-DFS-channels-to-be-selected-if-dfs-is-ena.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 89fa0d75fb1be82330258082ed3d7fd452eb6076 Mon Sep 17 00:00:00 2001
-From: Peter Oh <peter.oh@bowerswilkins.com>
-Date: Mon, 27 Aug 2018 14:28:45 -0700
-Subject: [PATCH 3/7] mesh: Allow DFS channels to be selected if dfs is enabled
-
-Note: DFS is assumed to be usable if a country code has been set
-
-Signed-off-by: Benjamin Berg <benjamin@sipsolutions.net>
-Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
----
- wpa_supplicant/wpa_supplicant.c | 24 ++++++++++++++++++------
- 1 file changed, 18 insertions(+), 6 deletions(-)
-
---- a/wpa_supplicant/wpa_supplicant.c
-+++ b/wpa_supplicant/wpa_supplicant.c
-@@ -2349,6 +2349,8 @@ void ibss_mesh_setup_freq(struct wpa_sup
-       int chwidth, seg0, seg1;
-       u32 vht_caps = 0;
-       int is_24ghz;
-+      int dfs_enabled = wpa_s->conf->country[0] &&
-+              (wpa_s->drv_flags & WPA_DRIVER_FLAGS_RADAR);
- 
-       freq->freq = ssid->frequency;
- 
-@@ -2436,8 +2438,11 @@ void ibss_mesh_setup_freq(struct wpa_sup
-               return;
- 
-       /* Check primary channel flags */
--      if (pri_chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR))
-+      if (pri_chan->flag & HOSTAPD_CHAN_DISABLED)
-               return;
-+      if (pri_chan->flag & (HOSTAPD_CHAN_RADAR | HOSTAPD_CHAN_NO_IR))
-+              if (!dfs_enabled)
-+                      return;
- 
-       freq->channel = pri_chan->chan;
- 
-@@ -2470,8 +2475,11 @@ void ibss_mesh_setup_freq(struct wpa_sup
-               return;
- 
-       /* Check secondary channel flags */
--      if (sec_chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR))
-+      if (sec_chan->flag & HOSTAPD_CHAN_DISABLED)
-               return;
-+      if (sec_chan->flag & (HOSTAPD_CHAN_RADAR | HOSTAPD_CHAN_NO_IR))
-+              if (!dfs_enabled)
-+                      return;
- 
-       if (ht40 == -1) {
-               if (!(pri_chan->flag & HOSTAPD_CHAN_HT40MINUS))
-@@ -2564,8 +2572,11 @@ skip_ht40:
-                       return;
- 
-               /* Back to HT configuration if channel not usable */
--              if (chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR))
-+              if (chan->flag & HOSTAPD_CHAN_DISABLED)
-                       return;
-+              if (chan->flag & (HOSTAPD_CHAN_RADAR | HOSTAPD_CHAN_NO_IR))
-+                      if (!dfs_enabled)
-+                              return;
-       }
- 
-       chwidth = CHANWIDTH_80MHZ;
-@@ -2585,10 +2596,11 @@ skip_ht40:
-                               if (!chan)
-                                       continue;
- 
--                              if (chan->flag & (HOSTAPD_CHAN_DISABLED |
--                                                HOSTAPD_CHAN_NO_IR |
--                                                HOSTAPD_CHAN_RADAR))
-+                              if (chan->flag & HOSTAPD_CHAN_DISABLED)
-                                       continue;
-+                              if (chan->flag & (HOSTAPD_CHAN_RADAR | HOSTAPD_CHAN_NO_IR))
-+                                      if (!dfs_enabled)
-+                                              continue;
- 
-                               /* Found a suitable second segment for 80+80 */
-                               chwidth = CHANWIDTH_80P80MHZ;