diff options
| author |   Chris Leech <christopher.leech@intel.com> | 2010-04-09 14:22:28 -0700 |
|---|---|---|
| committer |   James Bottomley <James.Bottomley@suse.de> | 2010-04-11 14:02:32 -0500 |
| commit | 03d29bc1d58dcfc2fa30aed7af199f24444c2052 (patch) | |
| tree | e1ffc9717e439aee7fda8658f21d3aab3bb6c396 /drivers | |
| parent | [SCSI] fcoe: reset FIP ctlr link state on disable/enable (diff) | |
| download | linux-dev-03d29bc1d58dcfc2fa30aed7af199f24444c2052.tar.xz linux-dev-03d29bc1d58dcfc2fa30aed7af199f24444c2052.zip | |
[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')
| -rw-r--r-- | drivers/scsi/fcoe/fcoe.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c index 0d8127e58feb..d16dd1232572 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 | |