Merge tag 'mips_fixes_4.21_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips...

[uclinux-h8/linux.git] / net / bridge / br_fdb.c

diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index e56ba39..fe3c758 100644 (file)
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -773,6 +773,32 @@ skip:
        return err;
 }
 
+int br_fdb_get(struct sk_buff *skb,
+              struct nlattr *tb[],
+              struct net_device *dev,
+              const unsigned char *addr,
+              u16 vid, u32 portid, u32 seq,
+              struct netlink_ext_ack *extack)
+{
+       struct net_bridge *br = netdev_priv(dev);
+       struct net_bridge_fdb_entry *f;
+       int err = 0;
+
+       rcu_read_lock();
+       f = br_fdb_find_rcu(br, addr, vid);
+       if (!f) {
+               NL_SET_ERR_MSG(extack, "Fdb entry not found");
+               err = -ENOENT;
+               goto errout;
+       }
+
+       err = fdb_fill_info(skb, br, f, portid, seq,
+                           RTM_NEWNEIGH, 0);
+errout:
+       rcu_read_unlock();
+       return err;
+}
+
 /* Update (create or replace) forwarding database entry */
 static int fdb_add_entry(struct net_bridge *br, struct net_bridge_port *source,
                         const u8 *addr, u16 state, u16 flags, u16 vid,
@@ -1164,3 +1190,23 @@ void br_fdb_offloaded_set(struct net_bridge *br, struct net_bridge_port *p,
 
        spin_unlock_bh(&br->hash_lock);
 }
+
+void br_fdb_clear_offload(const struct net_device *dev, u16 vid)
+{
+       struct net_bridge_fdb_entry *f;
+       struct net_bridge_port *p;
+
+       ASSERT_RTNL();
+
+       p = br_port_get_rtnl(dev);
+       if (!p)
+               return;
+
+       spin_lock_bh(&p->br->hash_lock);
+       hlist_for_each_entry(f, &p->br->fdb_list, fdb_node) {
+               if (f->dst == p && f->key.vlan_id == vid)
+                       f->offloaded = 0;
+       }
+       spin_unlock_bh(&p->br->hash_lock);
+}
+EXPORT_SYMBOL_GPL(br_fdb_clear_offload);