SVN: rc-scripts/trunk/sysconfig/network-scripts/ifup-br

[gotar]

Author: gotar
Date: Tue Nov  3 16:47:56 2009
New Revision: 10933

Modified:
   rc-scripts/trunk/sysconfig/network-scripts/ifup-br
Log:
- bridge forward delay is used regardless of STP,
- NB hello timer runs always too, it's just not used without STP


Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup-br
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup-br	(original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup-br	Tue Nov  3 16:47:56 2009
@@ -69,12 +69,12 @@
 # standard
 [ -n "$AGEING" ] && brctl setageing "$AGEING"
 [ -n "$GCINT" ] && brctl setgcint "$GCINT"
+[ -n "$FD" ] && brctl setfd ${DEVICE} "$FD"
 
 # spanning tree protocol
 if is_yes "$SPANNING_TREE"; then
 	brctl stp ${DEVICE} yes
 	[ -n "$BRIDGEPRIO" ] && brctl setbridgeprio ${DEVICE} "$BRIDGEPRIO"
-	[ -n "$FD" ] && brctl setfd ${DEVICE} "$FD"
 	[ -n "$HELLO" ] && brctl sethello ${DEVICE} "$HELLO"
 	[ -n "$MAXAGE" ] && brctl setmaxage ${DEVICE} "$MAXAGE"
 	[ -n "$PATHCOST" -a -n "$PATHCOST_PORT" ] && brctl setpathcost ${DEVICE} "$PATHCOST_PORT" "$PATHCOST"