From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 8 Nov 2011 14:24:01 +0000 (+0000)
Subject: [backfire] hostapd: merge r28858
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=b82951cf92ad4d134d52865e17d537139555571e

[backfire] hostapd: merge r28858

SVN-Revision: 28859
---

diff --git a/package/hostapd/files/wpa_supplicant.sh b/package/hostapd/files/wpa_supplicant.sh
index 6112517f37..1ab6c663e5 100644
--- a/package/hostapd/files/wpa_supplicant.sh
+++ b/package/hostapd/files/wpa_supplicant.sh
@@ -23,6 +23,15 @@ wpa_supplicant_setup_vif() {
 		config_set "$vif" bridge "$bridge"
 	}
 
+	local mode ifname wds
+	config_get mode "$vif" mode
+	config_get ifname "$vif" ifname
+	config_get_bool wds "$vif" wds 0
+	[ -z "$bridge" ] || [ "$mode" = ap ] || [ "$mode" = sta -a $wds -eq 1 ] || {
+		echo "wpa_supplicant_setup_vif($ifname): Refusing to bridge $mode mode interface"
+		return 1
+	}
+
 	case "$enc" in
 		*none*)
 			key_mgmt='NONE'