udev: Set all wireless interfaces to master mode before adding to bridge

[people/pmueller/ipfire-2.x.git] / config / udev / network-hotplug-bridges

diff --git a/config/udev/network-hotplug-bridges b/config/udev/network-hotplug-bridges
index 33d6d65ba558aa6137d585d155aee0dc42e41b08..a2ee56b8365d356b4b4c4c2ee565979485c10a76 100644 (file)
--- a/config/udev/network-hotplug-bridges
+++ b/config/udev/network-hotplug-bridges
@@ -81,19 +81,28 @@ MODE="$(get_value "${ZONE}_MODE")"
 
 # The name of the virtual bridge
 BRIDGE="$(get_value "${ZONE}_DEV")"
+STP="$(get_value "${ZONE}_STP")"
+STP_PRIORITY="$(get_value "${ZONE}_STP_PRIORITY")"
 
 case "${MODE}" in
        bridge)
+               # We need to check if $STP_PRIORITY has a valid value if not set it
+               if [ -z "${STP_PRIORITY}" ]; then
+                       STP_PRIORITY=16384
+               fi
+
                ADDRESS="$(get_value "${ZONE}_MACADDR")"
                [ -n "${ADDRESS}" ] || ADDRESS="$(random_mac_address)"
 
                # We need to create the bridge if it doesn't exist, yet
                if [ ! -d "/sys/class/net/${BRIDGE}" ]; then
-                       ip link add "${BRIDGE}" address "${ADDRESS}" type bridge
+                       ip link add "${BRIDGE}" address "${ADDRESS}" type bridge \
+                               $([ "${STP}" = "on" ] && echo "stp_state 1  priority ${STP_PRIORITY}" )
                        #ip link set "${BRIDGE}" up
                fi
 
-               if grep -q "INTERFACE=${INTERFACE}" "/var/ipfire/wlanap/settings" 2>/dev/null; then
+               # Try setting wireless interfaces into master mode
+               if [ -d "/sys/class/net/${INTERFACE}/phy80211" ]; then
                        iw dev "${INTERFACE}" set type __ap
                fi