From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 29 Oct 2008 16:27:06 +0000 (+0000)
Subject: merge r13075-13076 to 8.09
X-Git-Tag: 8.09_rc1~8
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=58dc20b0274e28ac79dc27a0a265fc71273e2400;p=openwrt%2Fsvn-archive%2Fopenwrt.git

merge r13075-13076 to 8.09

SVN-Revision: 13077
---

diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh
index 7a67cec949..1159c3b156 100644
--- a/package/hostapd/files/hostapd.sh
+++ b/package/hostapd/files/hostapd.sh
@@ -79,7 +79,10 @@ hostapd_setup_vif() {
 		11a) agmode=a;;
 		11b) agmode=b;;
 		11g) agmode=g;;
-		*) agmode=;;
+		*)
+			agmode=
+			[ "$channel" -gt 14 ] && agmode=a
+		;;
 	esac
 	cat > /var/run/hostapd-$ifname.conf <<EOF
 driver=$driver
diff --git a/package/hostapd/patches/100-madwifi_fix.patch b/package/hostapd/patches/100-madwifi_fix.patch
new file mode 100644
index 0000000000..45e9023624
--- /dev/null
+++ b/package/hostapd/patches/100-madwifi_fix.patch
@@ -0,0 +1,27 @@
+--- a/hostapd/driver_madwifi.c
++++ b/hostapd/driver_madwifi.c
+@@ -298,6 +298,7 @@ madwifi_set_iface_flags(void *priv, int 
+ {
+ 	struct madwifi_driver_data *drv = priv;
+ 	struct ifreq ifr;
++	short flags;
+ 
+ 	wpa_printf(MSG_DEBUG, "%s: dev_up=%d", __func__, dev_up);
+ 
+@@ -312,10 +313,14 @@ madwifi_set_iface_flags(void *priv, int 
+ 		return -1;
+ 	}
+ 
++	flags = ifr.ifr_flags;
+ 	if (dev_up)
+-		ifr.ifr_flags |= IFF_UP;
++		flags |= IFF_UP;
+ 	else
+-		ifr.ifr_flags &= ~IFF_UP;
++		flags &= ~IFF_UP;
++
++	if (flags == ifr.ifr_flags)
++		return 0;
+ 
+ 	if (ioctl(drv->ioctl_sock, SIOCSIFFLAGS, &ifr) != 0) {
+ 		perror("ioctl[SIOCSIFFLAGS]");