diff options
Diffstat (limited to 'drivers/scsi/bnx2fc/bnx2fc_fcoe.c')
-rw-r--r-- | drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c index e2e647509a73..cd050196a163 100644 --- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c +++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c | |||
@@ -664,7 +664,7 @@ static void bnx2fc_link_speed_update(struct fc_lport *lport) | |||
664 | struct fcoe_port *port = lport_priv(lport); | 664 | struct fcoe_port *port = lport_priv(lport); |
665 | struct bnx2fc_hba *hba = port->priv; | 665 | struct bnx2fc_hba *hba = port->priv; |
666 | struct net_device *netdev = hba->netdev; | 666 | struct net_device *netdev = hba->netdev; |
667 | struct ethtool_cmd ecmd = { ETHTOOL_GSET }; | 667 | struct ethtool_cmd ecmd; |
668 | 668 | ||
669 | if (!dev_ethtool_get_settings(netdev, &ecmd)) { | 669 | if (!dev_ethtool_get_settings(netdev, &ecmd)) { |
670 | lport->link_supported_speeds &= | 670 | lport->link_supported_speeds &= |
@@ -675,12 +675,15 @@ static void bnx2fc_link_speed_update(struct fc_lport *lport) | |||
675 | if (ecmd.supported & SUPPORTED_10000baseT_Full) | 675 | if (ecmd.supported & SUPPORTED_10000baseT_Full) |
676 | lport->link_supported_speeds |= FC_PORTSPEED_10GBIT; | 676 | lport->link_supported_speeds |= FC_PORTSPEED_10GBIT; |
677 | 677 | ||
678 | if (ecmd.speed == SPEED_1000) | 678 | switch (ethtool_cmd_speed(&ecmd)) { |
679 | case SPEED_1000: | ||
679 | lport->link_speed = FC_PORTSPEED_1GBIT; | 680 | lport->link_speed = FC_PORTSPEED_1GBIT; |
680 | if (ecmd.speed == SPEED_10000) | 681 | break; |
682 | case SPEED_10000: | ||
681 | lport->link_speed = FC_PORTSPEED_10GBIT; | 683 | lport->link_speed = FC_PORTSPEED_10GBIT; |
684 | break; | ||
685 | } | ||
682 | } | 686 | } |
683 | return; | ||
684 | } | 687 | } |
685 | static int bnx2fc_link_ok(struct fc_lport *lport) | 688 | static int bnx2fc_link_ok(struct fc_lport *lport) |
686 | { | 689 | { |