4 files changed, 13 insertions, 11 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 8cb75a6efec3..1dcb07ce5263 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -557,7 +557,7 @@ down:
 static int bond_update_speed_duplex(struct slave *slave)
 {
         struct net_device *slave_dev = slave->dev;
-        struct ethtool_cmd etool = { .cmd = ETHTOOL_GSET };
+        struct ethtool_cmd ecmd;
         u32 slave_speed;
         int res;
 
@@ -565,18 +565,15 @@ static int bond_update_speed_duplex(struct slave *slave)
         slave->speed = SPEED_100;
         slave->duplex = DUPLEX_FULL;
 
-        if (!slave_dev->ethtool_ops || !slave_dev->ethtool_ops->get_settings)
-                return -1;
-
-        res = slave_dev->ethtool_ops->get_settings(slave_dev, &etool);
+        res = __ethtool_get_settings(slave_dev, &ecmd);
         if (res < 0)
                 return -1;
 
-        slave_speed = ethtool_cmd_speed(&etool);
+        slave_speed = ethtool_cmd_speed(&ecmd);
         if (slave_speed == 0 || slave_speed == ((__u32) -1))
                 return -1;
 
-        switch (etool.duplex) {
+        switch (ecmd.duplex) {
         case DUPLEX_FULL:
         case DUPLEX_HALF:
                 break;
@@ -585,7 +582,7 @@ static int bond_update_speed_duplex(struct slave *slave)
         }
 
         slave->speed = slave_speed;
-        slave->duplex = etool.duplex;
+        slave->duplex = ecmd.duplex;
 
         return 0;
 }
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 836e13fcb3ec..b100c90e8507 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -543,7 +543,8 @@ static int macvlan_ethtool_get_settings(struct net_device *dev,
                                         struct ethtool_cmd *cmd)
 {
         const struct macvlan_dev *vlan = netdev_priv(dev);
-        return dev_ethtool_get_settings(vlan->lowerdev, cmd);
+
+        return __ethtool_get_settings(vlan->lowerdev, cmd);
 }
 
 static const struct ethtool_ops macvlan_ethtool_ops = {
diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index 2c780a78fcbd..820a1840c3f7 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -673,7 +673,7 @@ static void bnx2fc_link_speed_update(struct fc_lport *lport)
         struct net_device *netdev = interface->netdev;
         struct ethtool_cmd ecmd;
 
-        if (!dev_ethtool_get_settings(netdev, &ecmd)) {
+        if (!__ethtool_get_settings(netdev, &ecmd)) {
                 lport->link_supported_speeds &=
                         ~(FC_PORTSPEED_1GBIT | FC_PORTSPEED_10GBIT);
                 if (ecmd.supported & (SUPPORTED_1000baseT_Half |
@@ -1001,9 +1001,11 @@ static int bnx2fc_vport_create(struct fc_vport *vport, bool disabled)
                         "this interface\n");
                 return -EIO;
         }
+        rtnl_lock();
         mutex_lock(&bnx2fc_dev_lock);
         vn_port = bnx2fc_if_create(interface, &vport->dev, 1);
         mutex_unlock(&bnx2fc_dev_lock);
+        rtnl_unlock();
 
         if (IS_ERR(vn_port)) {
                 printk(KERN_ERR PFX "bnx2fc_vport_create (%s) failed\n",
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)
         struct net_device *netdev = fcoe_netdev(lport);
         struct ethtool_cmd ecmd;
 
-        if (!dev_ethtool_get_settings(netdev, &ecmd)) {
+        if (!__ethtool_get_settings(netdev, &ecmd)) {
                 lport->link_supported_speeds &=
                         ~(FC_PORTSPEED_1GBIT | FC_PORTSPEED_10GBIT);
                 if (ecmd.supported & (SUPPORTED_1000baseT_Half |
@@ -2452,7 +2452,9 @@ static int fcoe_vport_create(struct fc_vport *vport, bool disabled)
         }
 
         mutex_lock(&fcoe_config_mutex);
+        rtnl_lock();
         vn_port = fcoe_if_create(fcoe, &vport->dev, 1);
+        rtnl_unlock();
         mutex_unlock(&fcoe_config_mutex);
 
         if (IS_ERR(vn_port)) {