[backfire] hostapd: merge r28858

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@28859 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/hostapd/files/wpa_supplicant.sh b/package/hostapd/files/wpa_supplicant.sh
index 6112517f37cb31b862368c78a40684c03b9c708a..1ab6c663e573bda96e6138a96a1b341773eec70b 100644 (file)
--- 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'