Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2eea05b0 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

cxgb3: remove usage of dev->master

parent 49bd8fb0
Loading
Loading
Loading
Loading
+7 −4
Original line number Diff line number Diff line
@@ -182,14 +182,17 @@ static struct net_device *get_iff_from_mac(struct adapter *adapter,
		struct net_device *dev = adapter->port[i];

		if (!memcmp(dev->dev_addr, mac, ETH_ALEN)) {
			if (vlan && vlan != VLAN_VID_MASK) {
			rcu_read_lock();
			if (vlan && vlan != VLAN_VID_MASK) {
				dev = __vlan_find_dev_deep(dev, vlan);
				rcu_read_unlock();
			} else if (netif_is_bond_slave(dev)) {
				while (dev->master)
					dev = dev->master;
				struct net_device *upper_dev;

				while ((upper_dev =
					netdev_master_upper_dev_get_rcu(dev)))
					dev = upper_dev;
			}
			rcu_read_unlock();
			return dev;
		}
	}