From: Manuel Munz Date: Sat, 12 Jan 2013 21:11:00 +0000 (+0000) Subject: contrib/meshwizard: Fix detection if VAP is supported in interfaces firewall setup X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=73b0c8a5f22b88d9b87ff9cf567af456e5f6a20a;p=oweals%2Fluci.git contrib/meshwizard: Fix detection if VAP is supported in interfaces firewall setup --- diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall_interface.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall_interface.sh index 7f40f8714..fc664430f 100755 --- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall_interface.sh +++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_firewall_interface.sh @@ -45,7 +45,11 @@ network=$(echo $network) # Removes leading and trailing whitespaces [ -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