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

[openwrt/openwrt.git] / package / network / services / hostapd / patches / 031-mesh-add-VHT_CHANWIDTH_USE_HT-to-max_oper_chwidth.patch

diff --git a/package/network/services/hostapd/patches/031-mesh-add-VHT_CHANWIDTH_USE_HT-to-max_oper_chwidth.patch b/package/network/services/hostapd/patches/031-mesh-add-VHT_CHANWIDTH_USE_HT-to-max_oper_chwidth.patch
index 30003116e91515cbc809d1bfeb75013da5dba2f8..de64a59372c9627c8247cfecbca7cb39ee39b93f 100644 (file)
--- a/package/network/services/hostapd/patches/031-mesh-add-VHT_CHANWIDTH_USE_HT-to-max_oper_chwidth.patch
+++ b/package/network/services/hostapd/patches/031-mesh-add-VHT_CHANWIDTH_USE_HT-to-max_oper_chwidth.patch
@@ -15,11 +15,9 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
  wpa_supplicant/wpa_supplicant.c | 3 +++
  3 files changed, 5 insertions(+)
 
-diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c
-index f65bbb02f..7e8f014cc 100644
 --- a/wpa_supplicant/config.c
 +++ b/wpa_supplicant/config.c
-@@ -2798,6 +2798,7 @@ void wpa_config_set_network_defaults(struct wpa_ssid *ssid)
+@@ -2818,6 +2818,7 @@ void wpa_config_set_network_defaults(str
        ssid->mka_priority = DEFAULT_PRIO_NOT_KEY_SERVER;
  #endif /* CONFIG_MACSEC */
        ssid->mac_addr = -1;
@@ -27,8 +25,6 @@ index f65bbb02f..7e8f014cc 100644
  }
  
  
-diff --git a/wpa_supplicant/config_ssid.h b/wpa_supplicant/config_ssid.h
-index 9fd56c32f..2ddb777b2 100644
 --- a/wpa_supplicant/config_ssid.h
 +++ b/wpa_supplicant/config_ssid.h
 @@ -37,6 +37,7 @@
@@ -39,11 +35,9 @@ index 9fd56c32f..2ddb777b2 100644
  
  struct psk_list_entry {
        struct dl_list list;
-diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
-index dcd787bec..ca893f942 100644
 --- a/wpa_supplicant/wpa_supplicant.c
 +++ b/wpa_supplicant/wpa_supplicant.c
-@@ -2293,6 +2293,9 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s,
+@@ -2342,6 +2342,9 @@ void ibss_mesh_setup_freq(struct wpa_sup
                        vht_caps |= VHT_CAP_SUPP_CHAN_WIDTH_160MHZ;
                        seg0 = 114;
                }
@@ -53,6 +47,3 @@ index dcd787bec..ca893f942 100644
        }
  
        if (hostapd_set_freq_params(&vht_freq, mode->mode, freq->freq,
--- 
-2.17.0
-