hostapd: fix multi-ssid and AP+STA, clean up code

[15.05/openwrt.git] / package / network / services / hostapd / patches / 700-ubus_support.patch

diff --git a/package/network/services/hostapd/patches/700-ubus_support.patch b/package/network/services/hostapd/patches/700-ubus_support.patch
index c5ff795..81ada8c 100644 (file)
--- a/package/network/services/hostapd/patches/700-ubus_support.patch
+++ b/package/network/services/hostapd/patches/700-ubus_support.patch
@@ -480,7 +480,7 @@
 +#endif
 --- a/src/ap/hostapd.c
 +++ b/src/ap/hostapd.c
-@@ -270,6 +270,7 @@ static int hostapd_broadcast_wep_set(str
+@@ -265,6 +265,7 @@ static int hostapd_broadcast_wep_set(str
  
  static void hostapd_free_hapd_data(struct hostapd_data *hapd)
  {
@@ -488,7 +488,7 @@
        iapp_deinit(hapd->iapp);
        hapd->iapp = NULL;
        accounting_deinit(hapd);
-@@ -834,6 +835,8 @@ static int hostapd_setup_bss(struct host
+@@ -829,6 +830,8 @@ static int hostapd_setup_bss(struct host
        if (hapd->driver && hapd->driver->set_operstate)
                hapd->driver->set_operstate(hapd->drv_priv, 1);
  
@@ -497,7 +497,7 @@
        return 0;
  }
  
-@@ -984,6 +987,7 @@ int hostapd_setup_interface_complete(str
+@@ -979,6 +982,7 @@ int hostapd_setup_interface_complete(str
        if (err)
                goto error;
  
@@ -505,7 +505,7 @@
        wpa_printf(MSG_DEBUG, "Completing interface initialization");
        if (hapd->iconf->channel) {
                iface->freq = hostapd_hw_get_freq(hapd, hapd->iconf->channel);
-@@ -1076,6 +1080,7 @@ int hostapd_setup_interface_complete(str
+@@ -1071,6 +1075,7 @@ int hostapd_setup_interface_complete(str
  
  error:
        wpa_printf(MSG_ERROR, "Interface initialization failed");
@@ -513,7 +513,7 @@
        eloop_terminate();
        return -1;
  }
-@@ -1174,6 +1179,8 @@ void hostapd_interface_deinit_free(struc
+@@ -1169,6 +1174,8 @@ void hostapd_interface_deinit_free(struc
        void *drv_priv;
        if (iface == NULL)
                return;