net: bridge: make nbp_switchdev_unsync_objs() follow reverse order of sync()

There may be switchdev drivers that can add/remove a FDB or MDB entry
only as long as the VLAN it's in has been notified and offloaded first.
The nbp_switchdev_sync_objs() method satisfies this requirement on
addition, but nbp_switchdev_unsync_objs() first deletes VLANs, then
deletes MDBs and FDBs. Reverse the order of the function calls to cater
to this requirement.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/bridge/br_switchdev.c b/net/bridge/br_switchdev.c
index fb5115387d82051c4c2c487015b9d211d6e5dc73..b7c13f8cfce558d4d004966c40aeffacd03cae99 100644 (file)
--- a/net/bridge/br_switchdev.c
+++ b/net/bridge/br_switchdev.c
@@ -707,11 +707,11 @@ static void nbp_switchdev_unsync_objs(struct net_bridge_port *p,
        struct net_device *br_dev = p->br->dev;
        struct net_device *dev = p->dev;
 
-       br_switchdev_vlan_replay(br_dev, dev, ctx, false, blocking_nb, NULL);
+       br_switchdev_fdb_replay(br_dev, ctx, false, atomic_nb);
 
        br_switchdev_mdb_replay(br_dev, dev, ctx, false, blocking_nb, NULL);
 
-       br_switchdev_fdb_replay(br_dev, ctx, false, atomic_nb);
+       br_switchdev_vlan_replay(br_dev, dev, ctx, false, blocking_nb, NULL);
 }
 
 /* Let the bridge know that this port is offloaded, so that it can assign a