Commit 03d29bc1 authored by Chris Leech's avatar Chris Leech Committed by James Bottomley
Browse files

[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: default avatarChris Leech <christopher.leech@intel.com>
Signed-off-by: default avatarRobert Love <robert.w.love@intel.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 9ee50e48

drivers/scsi/fcoe/fcoe.c

+1 −2
Original line number Diff line number Diff line
@@ -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 |