- merged fixes for recent brctl

diff --git a/lib/ifup-br b/lib/ifup-br
index 4fd7b85f3e41c4e20eecc8d2e2298128b1250a5f..4182b5cfcfb03bbbf065d9dfa0d1664b6449a113 100755 (executable)
--- a/lib/ifup-br
+++ b/lib/ifup-br
@@ -65,20 +65,19 @@ done
 
 
 # standard
-[ -n "$AGEING" ] && brctl setageing "$AGEING"
-[ -n "$GCINT" ] && brctl setgcint "$GCINT"
+[ -n "$AGEING" ] && brctl setageing ${DEVICE} "$AGEING"
 [ -n "$FD" ] && brctl setfd ${DEVICE} "$FD"
 
 # spanning tree protocol
 if is_yes "$SPANNING_TREE"; then
-       brctl stp ${DEVICE} yes
+       brctl stp ${DEVICE} on
        [ -n "$BRIDGEPRIO" ] && brctl setbridgeprio ${DEVICE} "$BRIDGEPRIO"
        [ -n "$HELLO" ] && brctl sethello ${DEVICE} "$HELLO"
        [ -n "$MAXAGE" ] && brctl setmaxage ${DEVICE} "$MAXAGE"
        [ -n "$PATHCOST" -a -n "$PATHCOST_PORT" ] && brctl setpathcost ${DEVICE} "$PATHCOST_PORT" "$PATHCOST"
        [ -n "$PORTPRIO" -a -n "$PORTPRIO_PORT" ] && brctl setportprio ${DEVICE} "$PORTPRIO_PORT" "$PORTPRIO"
 else
-       brctl stp ${DEVICE} no
+       brctl stp ${DEVICE} off
 fi
 
 ip link set dev ${DEVICE} multicast ${MULTICAST} ${ARP}