openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: bridge: fdb_add_entry takes ndm as argument 

We can just pass ndm as an argument instead of its fields separately.

Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nikolay Aleksandrov 2020-06-23 23:47:15 +03:00 committed by David S. Miller
parent b430081b0c
commit 0592ff8834
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/bridge/br_fdb.c
View File

@ -793,11 +793,11 @@ int br_fdb_get(struct sk_buff *skb,
/* 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,
u8 ndm_flags)
const u8 *addr, struct ndmsg *ndm, u16 flags, u16 vid)
{
bool is_sticky = !!(ndm_flags & NTF_STICKY);
bool is_sticky = !!(ndm->ndm_flags & NTF_STICKY);
struct net_bridge_fdb_entry *fdb;
u16 state = ndm->ndm_state;
bool modified = false;
/* If the port cannot learn allow only local and static entries */
@ -893,8 +893,7 @@ static int __br_fdb_add(struct ndmsg *ndm, struct net_bridge *br,
err = br_fdb_external_learn_add(br, p, addr, vid, true);
} else {
spin_lock_bh(&br->hash_lock);
err = fdb_add_entry(br, p, addr, ndm->ndm_state,
nlh_flags, vid, ndm->ndm_flags);
err = fdb_add_entry(br, p, addr, ndm, nlh_flags, vid);
spin_unlock_bh(&br->hash_lock);
}