lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SCSI] fcoe: Call dev_ethtool_get_settings() in fcoe_link_ok

Browse Source 
No need to check phys_dev here, just call dev_ethtool_get_settings() directly
will take care of this.

Signed-off-by: Yi Zou <yi.zou@intel.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
Yi Zou
2009-07-29 17:04:01 -07:00
committed by James Bottomley
parent 5a84baeaf7
commit 2f718d64ec
1 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/scsi/fcoe/fcoe.c
View File

@@ -1635,12 +1635,9 @@ int fcoe_link_ok(struct fc_lport *lp)
struct fcoe_softc *fc = lport_priv(lp); struct fcoe_softc *fc = lport_priv(lp);
struct net_device *dev = fc->real_dev; struct net_device *dev = fc->real_dev;
struct ethtool_cmd ecmd = { ETHTOOL_GSET }; struct ethtool_cmd ecmd = { ETHTOOL_GSET };
int rc = 0;
if ((dev->flags & IFF_UP) && netif_carrier_ok(dev)) { if ((dev->flags & IFF_UP) && netif_carrier_ok(dev) &&
dev = fc->phys_dev; (!dev_ethtool_get_settings(dev, &ecmd))) {
if (dev->ethtool_ops->get_settings) {
dev->ethtool_ops->get_settings(dev, &ecmd);
lp->link_supported_speeds &= lp->link_supported_speeds &=
~(FC_PORTSPEED_1GBIT | FC_PORTSPEED_10GBIT); ~(FC_PORTSPEED_1GBIT | FC_PORTSPEED_10GBIT);
if (ecmd.supported & (SUPPORTED_1000baseT_Half | if (ecmd.supported & (SUPPORTED_1000baseT_Half |
@@ -1653,11 +1650,10 @@ int fcoe_link_ok(struct fc_lport *lp)
lp->link_speed = FC_PORTSPEED_1GBIT; lp->link_speed = FC_PORTSPEED_1GBIT;
if (ecmd.speed == SPEED_10000) if (ecmd.speed == SPEED_10000)
lp->link_speed = FC_PORTSPEED_10GBIT; lp->link_speed = FC_PORTSPEED_10GBIT;
}
} else
rc = -1;
return rc; return 0;
}
return -1;
} }
/** /**