hostapd: update to version 2018-12-02 (2.7)

[openwrt/openwrt.git] / package / network / services / hostapd / patches / 015-mesh-do-not-use-offchan-mgmt-tx-on-DFS.patch

diff --git a/package/network/services/hostapd/patches/015-mesh-do-not-use-offchan-mgmt-tx-on-DFS.patch b/package/network/services/hostapd/patches/015-mesh-do-not-use-offchan-mgmt-tx-on-DFS.patch
index 9d6ac82bf63fb27d9f63d10953f52cb79a60bb69..c921436925e6827fad87b93e0cd4165395692013 100644 (file)
--- a/package/network/services/hostapd/patches/015-mesh-do-not-use-offchan-mgmt-tx-on-DFS.patch
+++ b/package/network/services/hostapd/patches/015-mesh-do-not-use-offchan-mgmt-tx-on-DFS.patch
@@ -1,18 +1,20 @@
-From 48f31256ffebfc43d6b14b93597aa2c7e2975dc4 Mon Sep 17 00:00:00 2001
+From 9423e8be0393e82c8622806a0529e47fd5583c0b Mon Sep 17 00:00:00 2001
 From: Peter Oh <peter.oh@bowerswilkins.com>
-Date: Tue, 17 Apr 2018 21:55:12 -0700
-Subject: [PATCH 15/16] mesh: do not use offchan mgmt tx on DFS
+Date: Tue, 29 May 2018 14:39:19 -0700
+Subject: [PATCH 15/18] mesh: do not use offchan mgmt tx on DFS
 
 Drivers don't allow mesh to use offchannel on management Tx.
 
 Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+[daniel@makrotopia.org: adapted to changed ieee80211_is_dfs prototype]
 ---
- src/drivers/driver_nl80211.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
+ src/drivers/driver_nl80211.c | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
 
 --- a/src/drivers/driver_nl80211.c
 +++ b/src/drivers/driver_nl80211.c
-@@ -7165,6 +7165,10 @@ static int wpa_driver_nl80211_send_actio
+@@ -7268,6 +7268,10 @@ static int wpa_driver_nl80211_send_actio
        struct wpa_driver_nl80211_data *drv = bss->drv;
        int ret = -1;
        u8 *buf;
@@ -23,20 +25,20 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
        struct ieee80211_hdr *hdr;
  
        wpa_printf(MSG_DEBUG, "nl80211: Send Action frame (ifindex=%d, "
-@@ -7190,6 +7194,12 @@ static int wpa_driver_nl80211_send_actio
+@@ -7292,7 +7296,11 @@ static int wpa_driver_nl80211_send_actio
+       } else {
                os_memset(bss->rand_addr, 0, ETH_ALEN);
        }
- 
+-
 +      if (is_mesh_interface(drv->nlmode) &&
 +          (modes = nl80211_get_hw_feature_data(bss, &num_modes, &flags,
 +                                               &dfs_domain)) &&
 +          ieee80211_is_dfs(freq, modes, num_modes))
 +              offchanok = 0;
-+
        if (is_ap_interface(drv->nlmode) &&
            (!(drv->capa.flags & WPA_DRIVER_FLAGS_OFFCHANNEL_TX) ||
             (int) freq == bss->freq || drv->device_ap_sme ||
-@@ -7201,7 +7211,7 @@ static int wpa_driver_nl80211_send_actio
+@@ -7304,7 +7312,7 @@ static int wpa_driver_nl80211_send_actio
                ret = nl80211_send_frame_cmd(bss, freq, wait_time, buf,
                                             24 + data_len,
                                             &drv->send_action_cookie,