|
@@ -738,35 +738,6 @@ static int bnx2fc_shost_config(struct fc_lport *lport, struct device *dev)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static void bnx2fc_link_speed_update(struct fc_lport *lport)
|
|
|
-{
|
|
|
- struct fcoe_port *port = lport_priv(lport);
|
|
|
- struct bnx2fc_interface *interface = port->priv;
|
|
|
- struct net_device *netdev = interface->netdev;
|
|
|
- struct ethtool_cmd ecmd;
|
|
|
-
|
|
|
- if (!__ethtool_get_settings(netdev, &ecmd)) {
|
|
|
- lport->link_supported_speeds &=
|
|
|
- ~(FC_PORTSPEED_1GBIT | FC_PORTSPEED_10GBIT);
|
|
|
- if (ecmd.supported & (SUPPORTED_1000baseT_Half |
|
|
|
- SUPPORTED_1000baseT_Full))
|
|
|
- lport->link_supported_speeds |= FC_PORTSPEED_1GBIT;
|
|
|
- if (ecmd.supported & SUPPORTED_10000baseT_Full)
|
|
|
- lport->link_supported_speeds |= FC_PORTSPEED_10GBIT;
|
|
|
-
|
|
|
- switch (ethtool_cmd_speed(&ecmd)) {
|
|
|
- case SPEED_1000:
|
|
|
- lport->link_speed = FC_PORTSPEED_1GBIT;
|
|
|
- break;
|
|
|
- case SPEED_2500:
|
|
|
- lport->link_speed = FC_PORTSPEED_2GBIT;
|
|
|
- break;
|
|
|
- case SPEED_10000:
|
|
|
- lport->link_speed = FC_PORTSPEED_10GBIT;
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
-}
|
|
|
static int bnx2fc_link_ok(struct fc_lport *lport)
|
|
|
{
|
|
|
struct fcoe_port *port = lport_priv(lport);
|
|
@@ -824,7 +795,7 @@ static int bnx2fc_net_config(struct fc_lport *lport, struct net_device *netdev)
|
|
|
port->fcoe_pending_queue_active = 0;
|
|
|
setup_timer(&port->timer, fcoe_queue_timer, (unsigned long) lport);
|
|
|
|
|
|
- bnx2fc_link_speed_update(lport);
|
|
|
+ fcoe_link_speed_update(lport);
|
|
|
|
|
|
if (!lport->vport) {
|
|
|
if (fcoe_get_wwn(netdev, &wwnn, NETDEV_FCOE_WWNN))
|
|
@@ -928,7 +899,7 @@ static void bnx2fc_indicate_netevent(void *context, unsigned long event,
|
|
|
BNX2FC_HBA_DBG(lport, "netevent handler - event=%s %ld\n",
|
|
|
interface->netdev->name, event);
|
|
|
|
|
|
- bnx2fc_link_speed_update(lport);
|
|
|
+ fcoe_link_speed_update(lport);
|
|
|
|
|
|
cdev = fcoe_ctlr_to_ctlr_dev(ctlr);
|
|
|
|