aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/fcoe
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/fcoe')
-rw-r--r--drivers/scsi/fcoe/fcoe.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index 3416ab673814..83aa3ac52c40 100644
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -2043,7 +2043,7 @@ int fcoe_link_speed_update(struct fc_lport *lport)
2043 struct net_device *netdev = fcoe_netdev(lport); 2043 struct net_device *netdev = fcoe_netdev(lport);
2044 struct ethtool_cmd ecmd; 2044 struct ethtool_cmd ecmd;
2045 2045
2046 if (!dev_ethtool_get_settings(netdev, &ecmd)) { 2046 if (!__ethtool_get_settings(netdev, &ecmd)) {
2047 lport->link_supported_speeds &= 2047 lport->link_supported_speeds &=
2048 ~(FC_PORTSPEED_1GBIT | FC_PORTSPEED_10GBIT); 2048 ~(FC_PORTSPEED_1GBIT | FC_PORTSPEED_10GBIT);
2049 if (ecmd.supported & (SUPPORTED_1000baseT_Half | 2049 if (ecmd.supported & (SUPPORTED_1000baseT_Half |
@@ -2452,7 +2452,9 @@ static int fcoe_vport_create(struct fc_vport *vport, bool disabled)
2452 } 2452 }
2453 2453
2454 mutex_lock(&fcoe_config_mutex); 2454 mutex_lock(&fcoe_config_mutex);
2455 rtnl_lock();
2455 vn_port = fcoe_if_create(fcoe, &vport->dev, 1); 2456 vn_port = fcoe_if_create(fcoe, &vport->dev, 1);
2457 rtnl_unlock();
2456 mutex_unlock(&fcoe_config_mutex); 2458 mutex_unlock(&fcoe_config_mutex);
2457 2459
2458 if (IS_ERR(vn_port)) { 2460 if (IS_ERR(vn_port)) {