[tools] build fixes for squashfs4 on cygwin

[openwrt.git] / package / hostapd / patches / 120-countrycode.patch

diff --git a/package/hostapd/patches/120-countrycode.patch b/package/hostapd/patches/120-countrycode.patch
index b719544..8ffc65c 100644 (file)
--- a/package/hostapd/patches/120-countrycode.patch
+++ b/package/hostapd/patches/120-countrycode.patch
@@ -1,10 +1,14 @@
 --- a/hostapd/hostapd.c
 +++ b/hostapd/hostapd.c
-@@ -1535,7 +1535,6 @@ static int setup_interface(struct hostap
-           hostapd_set_ieee80211d(hapd, 1) < 0) {
-               printf("Failed to set ieee80211d (%d)\n",
-                      hapd->iconf->ieee80211d);
--              return -1;
+@@ -1546,10 +1546,8 @@ static int setup_interface(struct hostap
+       if (hapd->iconf->country[0] && hapd->iconf->country[1]) {
+               os_memcpy(country, hapd->iconf->country, 3);
+               country[3] = '\0';
+-              if (hostapd_set_country(hapd, country) < 0) {
++              if (hostapd_set_country(hapd, country) < 0)
+                       wpa_printf(MSG_ERROR, "Failed to set country code");
+-                      return -1;
+-              }
        }
  
-       if (hapd->iconf->bridge_packets != INTERNAL_BRIDGE_DO_NOT_CONTROL &&
+       if (hapd->iconf->ieee80211d &&