net/{bridge,iproute2}: Stricter iproute2 ip link syntax & promisc handling
The 'dev' argument is only optional for ethX devices, for others it is mandatory, so we should always include it. Also tweak when promisc mode is applied to bridges. Patches submitted by Denis Kaganovich <mahatma@bspu.unibel.by>. X-Gentoo-Bug: #431204 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=431204 Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
This commit is contained in:
parent
b68d4b3580
commit
9a9c2acd8d
@ -119,10 +119,8 @@ bridge_pre_start()
|
||||
return 1
|
||||
fi
|
||||
# The interface is known to exist now
|
||||
_set_flag promisc
|
||||
_up
|
||||
if ! brctl addif "${BR_IFACE}" "${x}"; then
|
||||
_set_flag -promisc
|
||||
eend 1
|
||||
return 1
|
||||
fi
|
||||
@ -144,6 +142,7 @@ bridge_pre_start()
|
||||
) || return 1
|
||||
|
||||
# Bring up the bridge
|
||||
_set_flag promisc
|
||||
_up
|
||||
}
|
||||
|
||||
|
@ -10,12 +10,12 @@ iproute2_depend()
|
||||
|
||||
_up()
|
||||
{
|
||||
ip link set "${IFACE}" up
|
||||
ip link set dev "${IFACE}" up
|
||||
}
|
||||
|
||||
_down()
|
||||
{
|
||||
ip link set "${IFACE}" down
|
||||
ip link set dev "${IFACE}" down
|
||||
}
|
||||
|
||||
_exists()
|
||||
@ -57,7 +57,7 @@ _set_flag()
|
||||
flag=${flag#-}
|
||||
opt="off"
|
||||
fi
|
||||
ip link set "${IFACE}" "${flag}" "${opt}"
|
||||
ip link set dev "${IFACE}" "${flag}" "${opt}"
|
||||
}
|
||||
|
||||
_get_mac_address()
|
||||
@ -79,7 +79,7 @@ _get_mac_address()
|
||||
|
||||
_set_mac_address()
|
||||
{
|
||||
ip link set "${IFACE}" address "$1"
|
||||
ip link set dev "${IFACE}" address "$1"
|
||||
}
|
||||
|
||||
_get_inet_addresses()
|
||||
@ -274,12 +274,12 @@ iproute2_pre_start()
|
||||
# MTU support
|
||||
local mtu=
|
||||
eval mtu=\$mtu_${IFVAR}
|
||||
[ -n "${mtu}" ] && ip link set "${IFACE}" mtu "${mtu}"
|
||||
[ -n "${mtu}" ] && ip link set dev "${IFACE}" mtu "${mtu}"
|
||||
|
||||
# TX Queue Length support
|
||||
local len=
|
||||
eval len=\$txqueuelen_${IFVAR}
|
||||
[ -n "${len}" ] && ip link set "${IFACE}" txqueuelen "${len}"
|
||||
[ -n "${len}" ] && ip link set dev "${IFACE}" txqueuelen "${len}"
|
||||
|
||||
return 0
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user