hostapd: update to 2014-06-03

[openwrt/openwrt.git] / package / network / services / hostapd / patches / 340-reload_freq_change.patch

diff --git a/package/network/services/hostapd/patches/340-reload_freq_change.patch b/package/network/services/hostapd/patches/340-reload_freq_change.patch
index d36b0460faae60948eb15a75abc5da481daa6734..d3e8918d710dee2ab570f3ad5e36891e425e3e3f 100644 (file)
--- a/package/network/services/hostapd/patches/340-reload_freq_change.patch
+++ b/package/network/services/hostapd/patches/340-reload_freq_change.patch
@@ -1,6 +1,6 @@
 --- a/src/ap/hostapd.c
 +++ b/src/ap/hostapd.c
-@@ -72,6 +72,16 @@ static void hostapd_reload_bss(struct ho
+@@ -70,6 +70,16 @@ static void hostapd_reload_bss(struct ho
  #endif /* CONFIG_NO_RADIUS */
  
        ssid = &hapd->conf->ssid;
@@ -17,3 +17,27 @@
        if (!ssid->wpa_psk_set && ssid->wpa_psk && !ssid->wpa_psk->next &&
            ssid->wpa_passphrase_set && ssid->wpa_passphrase) {
                /*
+@@ -170,20 +180,12 @@ int hostapd_reload_config(struct hostapd
+       oldconf = hapd->iconf;
+       iface->conf = newconf;
+ 
++      if (iface->conf->channel)
++              iface->freq = hostapd_hw_get_freq(hapd, iface->conf->channel);
++
+       for (j = 0; j < iface->num_bss; j++) {
+               hapd = iface->bss[j];
+               hapd->iconf = newconf;
+-              hapd->iconf->channel = oldconf->channel;
+-              hapd->iconf->secondary_channel = oldconf->secondary_channel;
+-              hapd->iconf->ieee80211n = oldconf->ieee80211n;
+-              hapd->iconf->ieee80211ac = oldconf->ieee80211ac;
+-              hapd->iconf->ht_capab = oldconf->ht_capab;
+-              hapd->iconf->vht_capab = oldconf->vht_capab;
+-              hapd->iconf->vht_oper_chwidth = oldconf->vht_oper_chwidth;
+-              hapd->iconf->vht_oper_centr_freq_seg0_idx =
+-                      oldconf->vht_oper_centr_freq_seg0_idx;
+-              hapd->iconf->vht_oper_centr_freq_seg1_idx =
+-                      oldconf->vht_oper_centr_freq_seg1_idx;
+               hapd->conf = newconf->bss[j];
+               hostapd_reload_bss(hapd);
+       }