net: ocelot: fix switchdev objects synced for wrong netdev with LAG o…

…ffload

The point with a *dev and a *brport_dev is that when we have a LAG net
device that is a bridge port, *dev is an ocelot net device and
*brport_dev is the bonding/team net device. The ocelot net device
beneath the LAG does not exist from the bridge's perspective, so we need
to sync the switchdev objects belonging to the brport_dev and not to the
dev.

Fixes: e4bd44e ("net: ocelot: replay switchdev events when joining bridge")
Signed-off-by: Vladimir Oltean <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

drivers/net/ethernet/mscc/ocelot_net.c

@@ -1298,6 +1298,7 @@ static int ocelot_netdevice_lag_leave(struct net_device *dev,
 }
 
 static int ocelot_netdevice_changeupper(struct net_device *dev,
+ struct net_device *brport_dev,
  struct netdev_notifier_changeupper_info *info)
 {
  struct netlink_ext_ack *extack;
@@ -1307,11 +1308,11 @@ static int ocelot_netdevice_changeupper(struct net_device *dev,
 
  if (netif_is_bridge_master(info->upper_dev)) {
  if (info->linking)
- err = ocelot_netdevice_bridge_join(dev, dev,
+ err = ocelot_netdevice_bridge_join(dev, brport_dev,
  info->upper_dev,
  extack);
  else
- err = ocelot_netdevice_bridge_leave(dev, dev,
+ err = ocelot_netdevice_bridge_leave(dev, brport_dev,
  info->upper_dev);
  }
  if (netif_is_lag_master(info->upper_dev)) {
@@ -1346,7 +1347,7 @@ ocelot_netdevice_lag_changeupper(struct net_device *dev,
  if (ocelot_port->bond != dev)
  return NOTIFY_OK;
 
- err = ocelot_netdevice_changeupper(lower, info);
+ err = ocelot_netdevice_changeupper(lower, dev, info);
  if (err)
  return notifier_from_errno(err);
  }
@@ -1385,7 +1386,7 @@ static int ocelot_netdevice_event(struct notifier_block *unused,
  struct netdev_notifier_changeupper_info *info = ptr;
 
  if (ocelot_netdevice_dev_check(dev))
- return ocelot_netdevice_changeupper(dev, info);
+ return ocelot_netdevice_changeupper(dev, dev, info);
 
  if (netif_is_lag_master(dev))
  return ocelot_netdevice_lag_changeupper(dev, info);