From 638fe0cf0a3a2f252c8dff5d353187e79d059c23 Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Fri, 9 Apr 2010 14:22:28 -0700 Subject: [PATCH] --- yaml --- r: 195638 b: refs/heads/master c: 03d29bc1d58dcfc2fa30aed7af199f24444c2052 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/fcoe/fcoe.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d83dbca13e44..122fb7325ca6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ee50e48d8370dbcb42fa5b62b5bb3a9877e1f47 +refs/heads/master: 03d29bc1d58dcfc2fa30aed7af199f24444c2052 diff --git a/trunk/drivers/scsi/fcoe/fcoe.c b/trunk/drivers/scsi/fcoe/fcoe.c index 0d8127e58feb..d16dd1232572 100644 --- a/trunk/drivers/scsi/fcoe/fcoe.c +++ b/trunk/drivers/scsi/fcoe/fcoe.c @@ -2148,8 +2148,7 @@ int fcoe_link_ok(struct fc_lport *lport) struct net_device *netdev = port->fcoe->netdev; struct ethtool_cmd ecmd = { ETHTOOL_GSET }; - if ((netdev->flags & IFF_UP) && netif_carrier_ok(netdev) && - (!dev_ethtool_get_settings(netdev, &ecmd))) { + if (netif_oper_up(netdev) && !dev_ethtool_get_settings(netdev, &ecmd)) { lport->link_supported_speeds &= ~(FC_PORTSPEED_1GBIT | FC_PORTSPEED_10GBIT); if (ecmd.supported & (SUPPORTED_1000baseT_Half |