--- v5
+++ v3
@@ -1,31 +1,21 @@
From: Vladimir Oltean <vladimir.oltean@nxp.com>
-
-When a port joins a bridge which already has local FDB entries pointing
-to the bridge device itself, we would like to offload those, so allow
-the "dev" argument to be equal to the bridge too. The code already does
-what we need in that case.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
-v4->v5: split in 2 separate checks, one for br_dev and one for dev,
- because it looks better
+ net/bridge/br_mdb.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
- net/bridge/br_fdb.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
-index bad7e84d76af..2b862cffc03a 100644
---- a/net/bridge/br_fdb.c
-+++ b/net/bridge/br_fdb.c
-@@ -760,7 +760,10 @@ int br_fdb_replay(const struct net_device *br_dev, const struct net_device *dev,
- unsigned long action;
- int err = 0;
+diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c
+index 17a720b4473f..fda61a90cfe5 100644
+--- a/net/bridge/br_mdb.c
++++ b/net/bridge/br_mdb.c
+@@ -617,7 +617,8 @@ int br_mdb_replay(struct net_device *br_dev, struct net_device *dev,
+
+ ASSERT_RTNL();
- if (!netif_is_bridge_master(br_dev) || !netif_is_bridge_port(dev))
-+ if (!netif_is_bridge_master(br_dev))
-+ return -EINVAL;
-+
-+ if (!netif_is_bridge_port(dev) && !netif_is_bridge_master(dev))
++ if (!netif_is_bridge_master(br_dev) ||
++ (!netif_is_bridge_port(dev) && !netif_is_bridge_master(dev)))
return -EINVAL;
br = netdev_priv(br_dev);