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

[openwrt/openwrt.git] / package / network / services / hostapd / patches / 010-mesh-consider-mesh-interface-on-dfs-event-handler.patch

diff --git a/package/network/services/hostapd/patches/010-mesh-consider-mesh-interface-on-dfs-event-handler.patch b/package/network/services/hostapd/patches/010-mesh-consider-mesh-interface-on-dfs-event-handler.patch
index 3f5178a74ba800fd088e3f8145bc58489719f3c8..0c82d84d6baac31f8aac37e29476e0db289ec5e2 100644 (file)
--- a/package/network/services/hostapd/patches/010-mesh-consider-mesh-interface-on-dfs-event-handler.patch
+++ b/package/network/services/hostapd/patches/010-mesh-consider-mesh-interface-on-dfs-event-handler.patch
@@ -15,7 +15,7 @@ Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
 
 --- a/wpa_supplicant/ap.c
 +++ b/wpa_supplicant/ap.c
-@@ -1337,13 +1337,18 @@ int ap_ctrl_iface_chanswitch(struct wpa_
+@@ -1379,13 +1379,18 @@ int ap_ctrl_iface_chanswitch(struct wpa_
  void wpas_ap_ch_switch(struct wpa_supplicant *wpa_s, int freq, int ht,
                       int offset, int width, int cf1, int cf2)
  {
@@ -37,7 +37,7 @@ Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
                                offset, width, cf1, cf2);
  }
  
-@@ -1540,10 +1545,16 @@ int wpas_ap_pmksa_cache_add_external(str
+@@ -1582,10 +1587,16 @@ int wpas_ap_pmksa_cache_add_external(str
  void wpas_ap_event_dfs_radar_detected(struct wpa_supplicant *wpa_s,
                                      struct dfs_event *radar)
  {
@@ -57,7 +57,7 @@ Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
                                   radar->ht_enabled, radar->chan_offset,
                                   radar->chan_width,
                                   radar->cf1, radar->cf2);
-@@ -1553,10 +1564,16 @@ void wpas_ap_event_dfs_radar_detected(st
+@@ -1595,10 +1606,16 @@ void wpas_ap_event_dfs_radar_detected(st
  void wpas_ap_event_dfs_cac_started(struct wpa_supplicant *wpa_s,
                                   struct dfs_event *radar)
  {
@@ -77,7 +77,7 @@ Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
                              radar->ht_enabled, radar->chan_offset,
                              radar->chan_width, radar->cf1, radar->cf2);
  }
-@@ -1565,10 +1582,16 @@ void wpas_ap_event_dfs_cac_started(struc
+@@ -1607,10 +1624,16 @@ void wpas_ap_event_dfs_cac_started(struc
  void wpas_ap_event_dfs_cac_finished(struct wpa_supplicant *wpa_s,
                                    struct dfs_event *radar)
  {
@@ -97,7 +97,7 @@ Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
                                 radar->ht_enabled, radar->chan_offset,
                                 radar->chan_width, radar->cf1, radar->cf2);
  }
-@@ -1577,10 +1600,16 @@ void wpas_ap_event_dfs_cac_finished(stru
+@@ -1619,10 +1642,16 @@ void wpas_ap_event_dfs_cac_finished(stru
  void wpas_ap_event_dfs_cac_aborted(struct wpa_supplicant *wpa_s,
                                   struct dfs_event *radar)
  {
@@ -117,7 +117,7 @@ Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
                                 radar->ht_enabled, radar->chan_offset,
                                 radar->chan_width, radar->cf1, radar->cf2);
  }
-@@ -1589,10 +1618,16 @@ void wpas_ap_event_dfs_cac_aborted(struc
+@@ -1631,10 +1660,16 @@ void wpas_ap_event_dfs_cac_aborted(struc
  void wpas_ap_event_dfs_cac_nop_finished(struct wpa_supplicant *wpa_s,
                                        struct dfs_event *radar)
  {
@@ -139,7 +139,7 @@ Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
  }
 --- a/wpa_supplicant/events.c
 +++ b/wpa_supplicant/events.c
-@@ -3802,7 +3802,7 @@ static void wpas_event_dfs_cac_started(s
+@@ -3840,7 +3840,7 @@ static void wpas_event_dfs_cac_started(s
                                       struct dfs_event *radar)
  {
  #if defined(NEED_AP_MLME) && defined(CONFIG_AP)
@@ -148,7 +148,7 @@ Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
                wpas_ap_event_dfs_cac_started(wpa_s, radar);
        } else
  #endif /* NEED_AP_MLME && CONFIG_AP */
-@@ -3823,7 +3823,7 @@ static void wpas_event_dfs_cac_finished(
+@@ -3861,7 +3861,7 @@ static void wpas_event_dfs_cac_finished(
                                        struct dfs_event *radar)
  {
  #if defined(NEED_AP_MLME) && defined(CONFIG_AP)
@@ -157,7 +157,7 @@ Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
                wpas_ap_event_dfs_cac_finished(wpa_s, radar);
        } else
  #endif /* NEED_AP_MLME && CONFIG_AP */
-@@ -3839,7 +3839,7 @@ static void wpas_event_dfs_cac_aborted(s
+@@ -3877,7 +3877,7 @@ static void wpas_event_dfs_cac_aborted(s
                                       struct dfs_event *radar)
  {
  #if defined(NEED_AP_MLME) && defined(CONFIG_AP)
@@ -166,7 +166,7 @@ Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
                wpas_ap_event_dfs_cac_aborted(wpa_s, radar);
        } else
  #endif /* NEED_AP_MLME && CONFIG_AP */
-@@ -4278,6 +4278,7 @@ void wpa_supplicant_event(void *ctx, enu
+@@ -4328,6 +4328,7 @@ void wpa_supplicant_event(void *ctx, enu
  #ifdef CONFIG_AP
                if (wpa_s->current_ssid->mode == WPAS_MODE_AP ||
                    wpa_s->current_ssid->mode == WPAS_MODE_P2P_GO ||