summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2020-08-21 13:07:07 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2020-08-21 13:07:07 -0400
commit402d380dfa7133b4890c12a8709aa94dfc0f6bf2 (patch)
treef74614b981b302f48924cbe5f167c98963269021
parent7ffc5b4febe5e5f449f698d8461771a8cfe02601 (diff)
downloadlongterm-queue-5.2-402d380dfa7133b4890c12a8709aa94dfc0f6bf2.tar.gz
net: vxlan: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/vxlan-fix-memleak-of-fdb.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/queue/vxlan-fix-memleak-of-fdb.patch b/queue/vxlan-fix-memleak-of-fdb.patch
index e2f8ca8c..d97dae4b 100644
--- a/queue/vxlan-fix-memleak-of-fdb.patch
+++ b/queue/vxlan-fix-memleak-of-fdb.patch
@@ -1,4 +1,4 @@
-From fda2ec62cf1aa7cbee52289dc8059cd3662795da Mon Sep 17 00:00:00 2001
+From d17621f4e10b7ece44939c14b79791f42324eed1 Mon Sep 17 00:00:00 2001
From: Taehee Yoo <ap420073@gmail.com>
Date: Sat, 1 Aug 2020 07:07:50 +0000
Subject: [PATCH] vxlan: fix memleak of fdb
@@ -67,10 +67,10 @@ Acked-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
-index 5efe1e28f270..a7c3939264b0 100644
+index 195fae570455..bfa7d8a88ac8 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
-@@ -3076,8 +3076,10 @@ static void vxlan_flush(struct vxlan_dev *vxlan, bool do_all)
+@@ -2847,8 +2847,10 @@ static void vxlan_flush(struct vxlan_dev *vxlan, bool do_all)
if (!do_all && (f->state & (NUD_PERMANENT | NUD_NOARP)))
continue;
/* the all_zeros_mac entry is deleted at vxlan_uninit */
@@ -81,8 +81,8 @@ index 5efe1e28f270..a7c3939264b0 100644
+ continue;
+ vxlan_fdb_destroy(vxlan, f, true, true);
}
- spin_unlock_bh(&vxlan->hash_lock[h]);
}
+ spin_unlock_bh(&vxlan->hash_lock);
--
2.27.0