net: make dev->master general

dev->master is now tightly connected to bonding driver. This patch makes
this pointer more general and ready to be used by others.

 - netdev_set_master() - bond specifics moved to new function
   netdev_set_bond_master()
 - introduced netif_is_bond_slave() to check if device is a bonding slave

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 7 insertions, 6 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 1df9f0ea9184..9f877878d636 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1594,9 +1594,9 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                 }
         }
 
-        res = netdev_set_master(slave_dev, bond_dev);
+        res = netdev_set_bond_master(slave_dev, bond_dev);
         if (res) {
-                pr_debug("Error %d calling netdev_set_master\n", res);
+                pr_debug("Error %d calling netdev_set_bond_master\n", res);
                 goto err_restore_mac;
         }
         /* open the slave since the application closed it */
@@ -1812,7 +1812,7 @@ err_close:
         dev_close(slave_dev);
 
 err_unset_master:
-        netdev_set_master(slave_dev, NULL);
+        netdev_set_bond_master(slave_dev, NULL);
 
 err_restore_mac:
         if (!bond->params.fail_over_mac) {
@@ -1992,7 +1992,7 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
                 netif_addr_unlock_bh(bond_dev);
         }
 
-        netdev_set_master(slave_dev, NULL);
+        netdev_set_bond_master(slave_dev, NULL);
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
         read_lock_bh(&bond->lock);
@@ -2114,7 +2114,7 @@ static int bond_release_all(struct net_device *bond_dev)
                         netif_addr_unlock_bh(bond_dev);
                 }
 
-                netdev_set_master(slave_dev, NULL);
+                netdev_set_bond_master(slave_dev, NULL);
 
                 /* close slave before restoring its mac address */
                 dev_close(slave_dev);
diff --git a/drivers/net/cxgb3/cxgb3_offload.c b/drivers/net/cxgb3/cxgb3_offload.c
index 7ea94b5205f8..862804f32b6e 100644
--- a/drivers/net/cxgb3/cxgb3_offload.c
+++ b/drivers/net/cxgb3/cxgb3_offload.c
@@ -186,9 +186,10 @@ static struct net_device *get_iff_from_mac(struct adapter *adapter,
                                 dev = NULL;
                                 if (grp)
                                         dev = vlan_group_get_device(grp, vlan);
-                        } else
+                        } else if (netif_is_bond_slave(dev)) {
                                 while (dev->master)
                                         dev = dev->master;
+                        }
                         return dev;
                 }
         }