kernel: update linux 3.2 to 3.2.12

[openwrt.git] / package / hostapd / patches / 600-terminate_on_setup_failure.patch

diff --git a/package/hostapd/patches/600-terminate_on_setup_failure.patch b/package/hostapd/patches/600-terminate_on_setup_failure.patch
index cc0f95e..2587954 100644 (file)
--- a/package/hostapd/patches/600-terminate_on_setup_failure.patch
+++ b/package/hostapd/patches/600-terminate_on_setup_failure.patch
@@ -1,6 +1,6 @@
 --- a/src/ap/hostapd.c
 +++ b/src/ap/hostapd.c
 --- a/src/ap/hostapd.c
 +++ b/src/ap/hostapd.c

-@@ -709,11 +709,8 @@ int hostapd_setup_interface_complete(str
+@@ -720,11 +720,8 @@ int hostapd_setup_interface_complete(str

        size_t j;
        u8 *prev_addr;
  
        size_t j;
        u8 *prev_addr;
  


@@ -14,7 +14,7 @@
  
        wpa_printf(MSG_DEBUG, "Completing interface initialization");
        if (hapd->iconf->channel) {
  
        wpa_printf(MSG_DEBUG, "Completing interface initialization");
        if (hapd->iconf->channel) {

-@@ -729,7 +726,7 @@ int hostapd_setup_interface_complete(str
+@@ -740,7 +737,7 @@ int hostapd_setup_interface_complete(str

                                     hapd->iconf->secondary_channel)) {
                        wpa_printf(MSG_ERROR, "Could not set channel for "
                                   "kernel driver");
                                     hapd->iconf->secondary_channel)) {
                        wpa_printf(MSG_ERROR, "Could not set channel for "
                                   "kernel driver");


@@ -23,7 +23,7 @@
                }
        }
  
                }
        }
  

-@@ -740,7 +737,7 @@ int hostapd_setup_interface_complete(str
+@@ -751,7 +748,7 @@ int hostapd_setup_interface_complete(str

                        hostapd_logger(hapd, NULL, HOSTAPD_MODULE_IEEE80211,
                                       HOSTAPD_LEVEL_WARNING,
                                       "Failed to prepare rates table.");
                        hostapd_logger(hapd, NULL, HOSTAPD_MODULE_IEEE80211,
                                       HOSTAPD_LEVEL_WARNING,
                                       "Failed to prepare rates table.");


@@ -32,7 +32,7 @@
                }
        }
  
                }
        }
  

-@@ -748,14 +745,14 @@ int hostapd_setup_interface_complete(str
+@@ -759,14 +756,14 @@ int hostapd_setup_interface_complete(str

            hostapd_set_rts(hapd, hapd->iconf->rts_threshold)) {
                wpa_printf(MSG_ERROR, "Could not set RTS threshold for "
                           "kernel driver");
            hostapd_set_rts(hapd, hapd->iconf->rts_threshold)) {
                wpa_printf(MSG_ERROR, "Could not set RTS threshold for "
                           "kernel driver");


@@ -49,7 +49,7 @@
        }
  
        prev_addr = hapd->own_addr;
        }
  
        prev_addr = hapd->own_addr;

-@@ -765,7 +762,7 @@ int hostapd_setup_interface_complete(str
+@@ -776,7 +773,7 @@ int hostapd_setup_interface_complete(str

                if (j)
                        os_memcpy(hapd->own_addr, prev_addr, ETH_ALEN);
                if (hostapd_setup_bss(hapd, j == 0))
                if (j)
                        os_memcpy(hapd->own_addr, prev_addr, ETH_ALEN);
                if (hostapd_setup_bss(hapd, j == 0))


@@ -58,7 +58,7 @@
                if (hostapd_mac_comp_empty(hapd->conf->bssid) == 0)
                        prev_addr = hapd->own_addr;
        }
                if (hostapd_mac_comp_empty(hapd->conf->bssid) == 0)
                        prev_addr = hapd->own_addr;
        }

-@@ -777,7 +774,7 @@ int hostapd_setup_interface_complete(str
+@@ -788,7 +785,7 @@ int hostapd_setup_interface_complete(str

        if (hostapd_driver_commit(hapd) < 0) {
                wpa_printf(MSG_ERROR, "%s: Failed to commit driver "
                           "configuration", __func__);
        if (hostapd_driver_commit(hapd) < 0) {
                wpa_printf(MSG_ERROR, "%s: Failed to commit driver "
                           "configuration", __func__);


@@ -66,8 +66,8 @@
 +              goto error;
        }
  
 +              goto error;
        }
  

-       wpa_printf(MSG_DEBUG, "%s: Setup of interface done.",
-@@ -787,6 +784,11 @@ int hostapd_setup_interface_complete(str
+       /*
+@@ -812,6 +809,11 @@ int hostapd_setup_interface_complete(str

                iface->init_complete(iface);
  
        return 0;
                iface->init_complete(iface);
  
        return 0;