summaryrefslogtreecommitdiff
path: root/drivers/scsi
diff options
context:
space:
mode:
authorChris Leech <christopher.leech@intel.com>2010-04-09 21:22:28 (GMT)
committerJames Bottomley <James.Bottomley@suse.de>2010-04-11 19:02:32 (GMT)
commit03d29bc1d58dcfc2fa30aed7af199f24444c2052 (patch)
treee1ffc9717e439aee7fda8658f21d3aab3bb6c396 /drivers/scsi
parent9ee50e48d8370dbcb42fa5b62b5bb3a9877e1f47 (diff)
downloadlinux-fsl-qoriq-03d29bc1d58dcfc2fa30aed7af199f24444c2052.tar.xz
[SCSI] fcoe: check netif operstate instead of IFF_UP & link state
Allow for dormant states while link configuration completes. In the default link mode, this is equivalent to the old check. Signed-off-by: Chris Leech <christopher.leech@intel.com> Signed-off-by: Robert Love <robert.w.love@intel.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/fcoe/fcoe.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index 0d8127e..d16dd12 100644
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/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 |