From 3c17a0e1112be70071e98d5208da5b55dcec20a6 Mon Sep 17 00:00:00 2001 From: Simon Casey Date: Wed, 2 Feb 2022 19:37:29 +0100 Subject: [PATCH] Update 607-qca-add-add-nss-bridge-mgr-support.patch for kernel 5.15 --- include/linux/if_bridge.h | 4 ++++ net/bridge/br_fdb.c | 25 +++++++++++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h @@ -254,4 +254,8 @@ typedef struct net_bridge_port *br_get_d extern br_get_dst_hook_t __rcu *br_get_dst_hook; /* QCA NSS ECM support - End */ +/* QCA NSS bridge-mgr support - Start */ +extern struct net_device *br_fdb_bridge_dev_get_and_hold(struct net_bridge *br); +/* QCA NSS bridge-mgr support - End */ + #endif --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c @@ -576,7 +576,7 @@ void br_fdb_cleanup(struct work_struct * unsigned long delay = hold_time(br); unsigned long work_delay = delay; unsigned long now = jiffies; - u8 mac_addr[6]; /* QCA NSS ECM support */ + struct br_fdb_event fdb_event; /* QCA NSS bridge-mgr support */ /* this part is tricky, in order to avoid blocking learning and * consequently forwarding, we rely on rcu to delete objects with @@ -604,12 +604,13 @@ void br_fdb_cleanup(struct work_struct * } else { spin_lock_bh(&br->hash_lock); if (!hlist_unhashed(&f->fdb_node)) { - ether_addr_copy(mac_addr, f->key.addr.addr); + memset(&fdb_event, 0, sizeof(fdb_event)); + ether_addr_copy(fdb_event.addr, f->key.addr.addr); fdb_delete(br, f, true); /* QCA NSS ECM support - Start */ atomic_notifier_call_chain( &br_fdb_update_notifier_list, 0, - (void *)mac_addr); + (void *)&fdb_event); /* QCA NSS ECM support - End */ } spin_unlock_bh(&br->hash_lock); @@ -907,10 +908,21 @@ static bool __fdb_mark_active(struct net test_and_clear_bit(BR_FDB_NOTIFY_INACTIVE, &fdb->flags)); } +/* QCA NSS bridge-mgr support - Start */ +/* Get the bridge device */ +struct net_device *br_fdb_bridge_dev_get_and_hold(struct net_bridge *br) +{ + dev_hold(br->dev); + return br->dev; +} +EXPORT_SYMBOL_GPL(br_fdb_bridge_dev_get_and_hold); +/* QCA NSS bridge-mgr support - End */ + void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source, const unsigned char *addr, u16 vid, unsigned long flags) { struct net_bridge_fdb_entry *fdb; + struct br_fdb_event fdb_event; /* QCA NSS bridge-mgr support */ /* some users want to always flood. */ if (hold_time(br) == 0) @@ -936,6 +948,12 @@ void br_fdb_update(struct net_bridge *br if (unlikely(source != READ_ONCE(fdb->dst) && !test_bit(BR_FDB_STICKY, &fdb->flags))) { br_switchdev_fdb_notify(br, fdb, RTM_DELNEIGH); + /* QCA NSS bridge-mgr support - Start */ + ether_addr_copy(fdb_event.addr, addr); + fdb_event.br = br; + fdb_event.orig_dev = fdb->dst->dev; + fdb_event.dev = source->dev; + /* QCA NSS bridge-mgr support - End */ WRITE_ONCE(fdb->dst, source); fdb_modified = true; /* Take over HW learned entry */ @@ -952,7 +970,7 @@ void br_fdb_update(struct net_bridge *br /* QCA NSS ECM support - Start */ atomic_notifier_call_chain( &br_fdb_update_notifier_list, - 0, (void *)addr); + 0, (void *)&fdb_event); /* QCA NSS ECM support - End */ }