| From cb8509f365a30c31fa03133b4dd95922e02cce5e Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 13 Jul 2021 12:33:50 +0300 |
| Subject: net: ocelot: fix switchdev objects synced for wrong netdev with LAG |
| offload |
| |
| From: Vladimir Oltean <vladimir.oltean@nxp.com> |
| |
| [ Upstream commit e56c6bbd98dc1cefb6f9c5d795fd29016e4f2fe7 ] |
| |
| 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: e4bd44e89dcf ("net: ocelot: replay switchdev events when joining bridge") |
| Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/mscc/ocelot_net.c | 9 +++++---- |
| 1 file changed, 5 insertions(+), 4 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/mscc/ocelot_net.c b/drivers/net/ethernet/mscc/ocelot_net.c |
| index aad33d22c33f..3dc577183a40 100644 |
| --- a/drivers/net/ethernet/mscc/ocelot_net.c |
| +++ b/drivers/net/ethernet/mscc/ocelot_net.c |
| @@ -1287,6 +1287,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; |
| @@ -1296,11 +1297,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)) { |
| @@ -1335,7 +1336,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); |
| } |
| @@ -1374,7 +1375,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); |
| -- |
| 2.30.2 |
| |
