From: Vladimir Oltean Date: Tue, 29 Jun 2021 14:06:46 +0000 (+0300) Subject: net: bridge: allow br_fdb_replay to be called for the bridge device X-Git-Tag: howlett/maple/20220722_2~2864^2~8^2~12 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f851a721a638316a8257459db8359f2930d4b473;p=users%2Fjedix%2Flinux-maple.git net: bridge: allow br_fdb_replay to be called for the bridge device 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 Signed-off-by: David S. Miller --- 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; - 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)) return -EINVAL; br = netdev_priv(br_dev);