UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

vxlan: make netlink notify in vxlan_fdb_destroy optional 

Add a new option do_notify to vxlan_fdb_destroy to make
sending netlink notify optional. Used by a later patch.

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Roopa Prabhu 2018-07-20 13:21:03 -07:00 committed by David S. Miller
parent 7431016b10
commit f6e0538586
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/vxlan.c
View File

@ -774,13 +774,15 @@ static void vxlan_fdb_free(struct rcu_head *head)
kfree(f); kfree(f);
} }
static void vxlan_fdb_destroy(struct vxlan_dev *vxlan, struct vxlan_fdb *f) static void vxlan_fdb_destroy(struct vxlan_dev *vxlan, struct vxlan_fdb *f,
bool do_notify)
{ {
netdev_dbg(vxlan->dev, netdev_dbg(vxlan->dev,
"delete %pM\n", f->eth_addr); "delete %pM\n", f->eth_addr);
--vxlan->addrcnt; --vxlan->addrcnt;
vxlan_fdb_notify(vxlan, f, first_remote_rtnl(f), RTM_DELNEIGH); if (do_notify)
vxlan_fdb_notify(vxlan, f, first_remote_rtnl(f), RTM_DELNEIGH);
hlist_del_rcu(&f->hlist); hlist_del_rcu(&f->hlist);
call_rcu(&f->rcu, vxlan_fdb_free); call_rcu(&f->rcu, vxlan_fdb_free);
@ -930,7 +932,7 @@ static int __vxlan_fdb_delete(struct vxlan_dev *vxlan,
goto out; goto out;
} }
vxlan_fdb_destroy(vxlan, f); vxlan_fdb_destroy(vxlan, f, true);
out: out:
return 0; return 0;
@ -2397,7 +2399,7 @@ static void vxlan_cleanup(struct timer_list *t)
"garbage collect %pM\n", "garbage collect %pM\n",
f->eth_addr); f->eth_addr);
f->state = NUD_STALE; f->state = NUD_STALE;
vxlan_fdb_destroy(vxlan, f); vxlan_fdb_destroy(vxlan, f, true);
} else if (time_before(timeout, next_timer)) } else if (time_before(timeout, next_timer))
next_timer = timeout; next_timer = timeout;
} }
@ -2448,7 +2450,7 @@ static void vxlan_fdb_delete_default(struct vxlan_dev *vxlan, __be32 vni)
spin_lock_bh(&vxlan->hash_lock); spin_lock_bh(&vxlan->hash_lock);
f = __vxlan_find_mac(vxlan, all_zeros_mac, vni); f = __vxlan_find_mac(vxlan, all_zeros_mac, vni);
if (f) if (f)
vxlan_fdb_destroy(vxlan, f); vxlan_fdb_destroy(vxlan, f, true);
spin_unlock_bh(&vxlan->hash_lock); spin_unlock_bh(&vxlan->hash_lock);
} }
@ -2502,7 +2504,7 @@ static void vxlan_flush(struct vxlan_dev *vxlan, bool do_all)
continue; continue;
/* the all_zeros_mac entry is deleted at vxlan_uninit */ /* the all_zeros_mac entry is deleted at vxlan_uninit */
if (!is_zero_ether_addr(f->eth_addr)) if (!is_zero_ether_addr(f->eth_addr))
vxlan_fdb_destroy(vxlan, f); vxlan_fdb_destroy(vxlan, f, true);
} }
} }
spin_unlock_bh(&vxlan->hash_lock); spin_unlock_bh(&vxlan->hash_lock);