[backfire] backport mac80211 and hostapd from trunk

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

diff --git a/package/hostapd/patches/110-countrycode.patch b/package/hostapd/patches/110-countrycode.patch
index 73738f15ea6587b532f2e14a642db17ae3c68407..88dd1e92ebbd26fd004b8ab052df45fb766af6ce 100644 (file)
--- a/package/hostapd/patches/110-countrycode.patch
+++ b/package/hostapd/patches/110-countrycode.patch
@@ -1,14 +1,10 @@
---- a/hostapd/hostapd.c
-+++ b/hostapd/hostapd.c
-@@ -1339,10 +1339,8 @@ static int setup_interface(struct hostap
-       if (hapd->iconf->country[0] && hapd->iconf->country[1]) {
-               os_memcpy(country, hapd->iconf->country, 3);
+--- a/src/ap/hostapd.c
++++ b/src/ap/hostapd.c
+@@ -659,7 +659,6 @@ static int setup_interface(struct hostap
                country[3] = '\0';
--              if (hostapd_set_country(hapd, country) < 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 &&