aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding/bond_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
-rw-r--r--drivers/net/bonding/bond_main.c26
1 files changed, 12 insertions, 14 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 63369b6b14d..e4166ee9091 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -695,6 +695,18 @@ static int bond_check_dev_link(struct bonding *bond, struct net_device *slave_de
695 if (bond->params.use_carrier) 695 if (bond->params.use_carrier)
696 return netif_carrier_ok(slave_dev) ? BMSR_LSTATUS : 0; 696 return netif_carrier_ok(slave_dev) ? BMSR_LSTATUS : 0;
697 697
698 /* Try to get link status using Ethtool first. */
699 if (slave_dev->ethtool_ops) {
700 if (slave_dev->ethtool_ops->get_link) {
701 u32 link;
702
703 link = slave_dev->ethtool_ops->get_link(slave_dev);
704
705 return link ? BMSR_LSTATUS : 0;
706 }
707 }
708
709 /* Ethtool can't be used, fallback to MII ioclts. */
698 ioctl = slave_ops->ndo_do_ioctl; 710 ioctl = slave_ops->ndo_do_ioctl;
699 if (ioctl) { 711 if (ioctl) {
700 /* TODO: set pointer to correct ioctl on a per team member */ 712 /* TODO: set pointer to correct ioctl on a per team member */
@@ -721,20 +733,6 @@ static int bond_check_dev_link(struct bonding *bond, struct net_device *slave_de
721 } 733 }
722 734
723 /* 735 /*
724 * Some drivers cache ETHTOOL_GLINK for a period of time so we only
725 * attempt to get link status from it if the above MII ioctls fail.
726 */
727 if (slave_dev->ethtool_ops) {
728 if (slave_dev->ethtool_ops->get_link) {
729 u32 link;
730
731 link = slave_dev->ethtool_ops->get_link(slave_dev);
732
733 return link ? BMSR_LSTATUS : 0;
734 }
735 }
736
737 /*
738 * If reporting, report that either there's no dev->do_ioctl, 736 * If reporting, report that either there's no dev->do_ioctl,
739 * or both SIOCGMIIREG and get_link failed (meaning that we 737 * or both SIOCGMIIREG and get_link failed (meaning that we
740 * cannot report link status). If not reporting, pretend 738 * cannot report link status). If not reporting, pretend