contrib/meshwizard: Fix detection if VAP is supported in interfaces firewall setup
authorManuel Munz <freifunk@somakoma.de>
Sat, 12 Jan 2013 21:11:00 +0000 (21:11 +0000)
committerManuel Munz <freifunk@somakoma.de>
Sat, 12 Jan 2013 21:11:00 +0000 (21:11 +0000)
contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall_interface.sh

index 7f40f87..fc66443 100755 (executable)
@@ -45,7 +45,11 @@ network=$(echo $network) # Removes leading and trailing whitespaces
 
 [ -n "$netrenamed" ] && [ -z "$(echo $network | grep $netrenamed)" ] && network="$network $netrenamed"
 
 
 [ -n "$netrenamed" ] && [ -z "$(echo $network | grep $netrenamed)" ] && network="$network $netrenamed"
 
-if [ "$type" == "atheros" -a "$vap" == 1 ]; then
+# check if this hardware supports VAPs
+supports_vap="0"
+$dir/helpers/supports_vap.sh $net $type && supports_vap=1
+
+if [ "$supports_vap" == "1" -a "$vap" == 1 ]; then
         [ -n "$netrenamed" ] && [ "$network" == "${network/${netrenamed}dhcp/}" ] && network="$network ${netrenamed}dhcp"
 fi
 
         [ -n "$netrenamed" ] && [ "$network" == "${network/${netrenamed}dhcp/}" ] && network="$network ${netrenamed}dhcp"
 fi