| Message ID | 1539286513-26165-1-git-send-email-roopa@cumulusnetworks.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next,v2] vxlan: support NTF_USE refresh of fdb entries | expand |
On Thu, 11 Oct 2018 12:35:13 -0700 Roopa Prabhu <roopa@cumulusnetworks.com> wrote: > From: Roopa Prabhu <roopa@cumulusnetworks.com> > > This makes use of NTF_USE in vxlan driver consistent > with bridge driver. > > Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com> > --- > v2: fix patch prefix > > drivers/net/vxlan.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) Acked-by: Stephen Hemminger <stephen@networkplumber.org>
From: Roopa Prabhu <roopa@cumulusnetworks.com> Date: Thu, 11 Oct 2018 12:35:13 -0700 > From: Roopa Prabhu <roopa@cumulusnetworks.com> > > This makes use of NTF_USE in vxlan driver consistent > with bridge driver. > > Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com> Applied.
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index fb0cdbb..018406c 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -697,6 +697,7 @@ static int vxlan_fdb_update(struct vxlan_dev *vxlan, __be16 port, __be32 src_vni, __be32 vni, __u32 ifindex, __u8 ndm_flags) { + __u8 fdb_flags = (ndm_flags & ~NTF_USE); struct vxlan_rdst *rd = NULL; struct vxlan_fdb *f; int notify = 0; @@ -714,8 +715,8 @@ static int vxlan_fdb_update(struct vxlan_dev *vxlan, f->updated = jiffies; notify = 1; } - if (f->flags != ndm_flags) { - f->flags = ndm_flags; + if (f->flags != fdb_flags) { + f->flags = fdb_flags; f->updated = jiffies; notify = 1; } @@ -737,6 +738,9 @@ static int vxlan_fdb_update(struct vxlan_dev *vxlan, return rc; notify |= rc; } + + if (ndm_flags & NTF_USE) + f->used = jiffies; } else { if (!(flags & NLM_F_CREATE)) return -ENOENT; @@ -748,7 +752,7 @@ static int vxlan_fdb_update(struct vxlan_dev *vxlan, netdev_dbg(vxlan->dev, "add %pM -> %pIS\n", mac, ip); rc = vxlan_fdb_create(vxlan, mac, ip, state, port, src_vni, - vni, ifindex, ndm_flags, &f); + vni, ifindex, fdb_flags, &f); if (rc < 0) return rc; notify = 1;