From 2e63dbdf6c68d6364388ffa9d7da9a016a57c625 Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Thu, 8 Nov 2012 11:03:30 +0100
Subject: Apply BONDING_OPT on ifup of master (#874030)

---
 sysconfig/network-scripts/ifup-eth          | 1 +
 sysconfig/network-scripts/network-functions | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

(limited to 'sysconfig/network-scripts')

diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index 5ef3055c..7dc9fc67 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -120,6 +120,7 @@ fi
 if [ "$ISALIAS" = no ] && is_bonding_device ${DEVICE} ; then
     /sbin/ip link set dev ${DEVICE} up
     [ -n "${LINKDELAY}" ] && /bin/sleep ${LINKDELAY}
+    install_bonding_driver ${DEVICE}
     for device in $(LANG=C egrep -l "^[[:space:]]*MASTER=\"?${DEVICE}\"?[[:space:]]*$" /etc/sysconfig/network-scripts/ifcfg-*) ; do
 	    is_ignored_file "$device" && continue
 	    /sbin/ifup ${device##*/}
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index 0fd55708..1b31f999 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -414,7 +414,6 @@ is_wireless_device ()
 
 install_bonding_driver ()
 {
-   ethtool -i $1 2>/dev/null | grep -q "driver: bonding" && return 0
    [ ! -f /sys/class/net/bonding_masters ] && ( modprobe bonding || return 1 )
    if ! grep -sq "$1" /sys/class/net/bonding_masters; then
        echo "+$1" > /sys/class/net/bonding_masters 2>/dev/null
-- 
cgit v1.2.1