hostapd: update to git snapshot of 2018-04-09

[openwrt/openwrt.git] / package / network / services / hostapd / patches / 463-add-mcast_rate-to-11s.patch

diff --git a/package/network/services/hostapd/patches/463-add-mcast_rate-to-11s.patch b/package/network/services/hostapd/patches/463-add-mcast_rate-to-11s.patch
index ef615d2b2f43cf984fc9f9da56c47da1df731184..b868884a97c0d142d22192b80b5254f73840b064 100644 (file)
--- a/package/network/services/hostapd/patches/463-add-mcast_rate-to-11s.patch
+++ b/package/network/services/hostapd/patches/463-add-mcast_rate-to-11s.patch
@@ -19,17 +19,17 @@ Tested-by: Simon Wunderlich <simon.wunderlich@openmesh.com>
 
 --- a/src/drivers/driver.h
 +++ b/src/drivers/driver.h
-@@ -1394,6 +1394,7 @@ struct wpa_driver_mesh_join_params {
- #define WPA_DRIVER_MESH_FLAG_SAE_AUTH 0x00000004
+@@ -1395,6 +1395,7 @@ struct wpa_driver_mesh_join_params {
  #define WPA_DRIVER_MESH_FLAG_AMPE     0x00000008
        unsigned int flags;
+       u8 handle_dfs;
 +      int mcast_rate;
  };
  
  /**
 --- a/src/drivers/driver_nl80211.c
 +++ b/src/drivers/driver_nl80211.c
-@@ -9210,6 +9210,18 @@ static int nl80211_put_mesh_id(struct nl
+@@ -9217,6 +9217,18 @@ static int nl80211_put_mesh_id(struct nl
  }
  
  
@@ -48,7 +48,7 @@ Tested-by: Simon Wunderlich <simon.wunderlich@openmesh.com>
  static int nl80211_put_mesh_config(struct nl_msg *msg,
                                   struct wpa_driver_mesh_bss_params *params)
  {
-@@ -9268,6 +9280,7 @@ static int nl80211_join_mesh(struct i802
+@@ -9275,6 +9287,7 @@ static int nl80211_join_mesh(struct i802
            nl80211_put_basic_rates(msg, params->basic_rates) ||
            nl80211_put_mesh_id(msg, params->meshid, params->meshid_len) ||
            nl80211_put_beacon_int(msg, params->beacon_int) ||
@@ -58,11 +58,11 @@ Tested-by: Simon Wunderlich <simon.wunderlich@openmesh.com>
  
 --- a/wpa_supplicant/mesh.c
 +++ b/wpa_supplicant/mesh.c
-@@ -379,6 +379,7 @@ int wpa_supplicant_join_mesh(struct wpa_
-       os_memset(&params, 0, sizeof(params));
-       params.meshid = ssid->ssid;
-       params.meshid_len = ssid->ssid_len;
-+      params.mcast_rate = ssid->mcast_rate;
-       ibss_mesh_setup_freq(wpa_s, ssid, &params.freq);
-       wpa_s->mesh_ht_enabled = !!params.freq.ht_enabled;
-       wpa_s->mesh_vht_enabled = !!params.freq.vht_enabled;
+@@ -448,6 +448,7 @@ int wpa_supplicant_join_mesh(struct wpa_
+ 
+       params->meshid = ssid->ssid;
+       params->meshid_len = ssid->ssid_len;
++      params->mcast_rate = ssid->mcast_rate;
+       ibss_mesh_setup_freq(wpa_s, ssid, &params->freq);
+       wpa_s->mesh_ht_enabled = !!params->freq.ht_enabled;
+       wpa_s->mesh_vht_enabled = !!params->freq.vht_enabled;