diff options
| author | Jiri Pirko <jpirko@redhat.com> | 2011-02-12 06:48:36 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-13 10:42:07 -0800 |
| commit | 1765a575334f1a232c1478accdee5c7d19f4b3e3 (patch) | |
| tree | 6613f53ce9095b799048d891f0b4b6e34a479fe0 /drivers/net/cxgb3/cxgb3_offload.c | |
| parent | d59cfde2fb960b5970ccb5a38cea25d38b37a8e8 (diff) | |
| download | blackbird-op-linux-1765a575334f1a232c1478accdee5c7d19f4b3e3.tar.gz blackbird-op-linux-1765a575334f1a232c1478accdee5c7d19f4b3e3.zip | |
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>
Diffstat (limited to 'drivers/net/cxgb3/cxgb3_offload.c')
| -rw-r--r-- | drivers/net/cxgb3/cxgb3_offload.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; } } |
