bridge: remove support for gcint (noop in modern kernels), use iproute2 commands for all bridge configuration if present
This commit is contained in:
parent
36eb6e3377
commit
6c5d856ac4
1 changed files with 16 additions and 2 deletions
|
@ -80,8 +80,6 @@ set_bridge_opts_brctl() {
|
|||
&& brctl setbridgeprio $IFACE $IF_BRIDGE_BRIDGEPRIO
|
||||
[ -n "$IF_BRIDGE_FD" ] \
|
||||
&& brctl setfd $IFACE $IF_BRIDGE_FD
|
||||
[ -n "$IF_BRIDGE_GCINT" ] \
|
||||
&& brctl setgcint $IFACE $IF_BRIDGE_GCINT
|
||||
[ -n "$IF_BRIDGE_HELLO" ] \
|
||||
&& brctl sethello $IFACE $IF_BRIDGE_HELLO
|
||||
[ -n "$IF_BRIDGE_MAXAGE" ] \
|
||||
|
@ -95,6 +93,22 @@ set_bridge_opts_brctl() {
|
|||
}
|
||||
|
||||
set_bridge_opts_iproute2() {
|
||||
[ -n "$IF_BRIDGE_AGEING" ] \
|
||||
&& ip link set dev $IFACE type bridge ageing_time $IF_BRIDGE_AGEING
|
||||
[ -n "$IF_BRIDGE_BRIDGEPRIO" ] \
|
||||
&& ip link set dev $IFACE type bridge priority $IF_BRIDGE_BRIDGEPRIO
|
||||
[ -n "$IF_BRIDGE_FD" ] \
|
||||
&& ip link set dev $IFACE type bridge forward_delay $IF_BRIDGE_FD
|
||||
[ -n "$IF_BRIDGE_HELLO" ] \
|
||||
&& ip link set dev $IFACE type bridge hello_time $IF_BRIDGE_HELLO
|
||||
[ -n "$IF_BRIDGE_MAXAGE" ] \
|
||||
&& ip link set dev $IFACE type bridge max_age $IF_BRIDGE_MAXAGE
|
||||
[ -n "$IF_BRIDGE_PATHCOST" ] \
|
||||
&& bridge link set dev $IFACE cost $IF_BRIDGE_PATHCOST
|
||||
[ -n "$IF_BRIDGE_PORTPRIO" ] \
|
||||
&& bridge link set dev $IFACE priority $IF_BRIDGE_PORTPRIO
|
||||
[ -n "$IF_BRIDGE_STP" ] \
|
||||
&& ip link set dev $IFACE type bridge stp $IF_BRIDGE_STP
|
||||
}
|
||||
|
||||
set_bridge_opts() {
|
||||
|
|
Loading…
Reference in a new issue