From 759f4ca4f2a7ee6be9ed13e7fd3fcd9cce44d865 Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Thu, 29 Dec 2011 18:00:25 -0600 Subject: net: remove _check_macvlan function This test is incorrect, and we do not need the modprobe. If macvlan is a module, it is automatically modprobed when the first macvlan link is added. Also, the /sys directory referred to in the test does not exist if macvlan is built into the kernel. Reported-by: Marien Zwart X-Gentoo-Bug: 396427 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=396427 --- net/macvlan.sh | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'net/macvlan.sh') diff --git a/net/macvlan.sh b/net/macvlan.sh index b8a8ffa..fb5fcdb 100644 --- a/net/macvlan.sh +++ b/net/macvlan.sh @@ -24,17 +24,6 @@ _is_macvlan() [ -n "$(export RC_SVCNAME="net.${IFACE}"; service_get_value macvlan)" ] } -_check_macvlan() -{ - if [ ! -d /sys/module/macvlan ]; then - modprobe macvlan - if [ ! -d /sys/module/macvlan ]; then - eerror "MAC-VLAN support is not present in this kernel" - return 1 - fi - fi -} - macvlan_pre_start() { # MAC-VLAN needs an existing interface to link to @@ -42,8 +31,6 @@ macvlan_pre_start() eval macvlan=\$macvlan_${IFVAR} [ -z "${macvlan}" ] && return 0 - _check_macvlan || return 1 - case " ${MODULES} " in *" ifconfig "*) eerror "sys-apps/iproute2 is required to configure MACVLANs" -- cgit v1.2.3