drop queue-4.19/net-bridge-explicitly-zero-is_sticky-in-fdb_create.patch

Broke the build

diff --git a/queue-4.19/net-bridge-explicitly-zero-is_sticky-in-fdb_create.patch b/queue-4.19/net-bridge-explicitly-zero-is_sticky-in-fdb_create.patch
deleted file mode 100644 (file)
index 1f7f4b4..0000000
--- a/queue-4.19/net-bridge-explicitly-zero-is_sticky-in-fdb_create.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 1288aa7af20cfa25cb00cf0d77f94d1891644c83 Mon Sep 17 00:00:00 2001
-From: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
-Date: Thu, 27 Sep 2018 15:05:10 +0300
-Subject: net: bridge: explicitly zero is_sticky in fdb_create
-
-From: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
-
-commit 1288aa7af20cfa25cb00cf0d77f94d1891644c83 upstream.
-
-We need to explicitly zero is_sticky when creating a new fdb, otherwise
-we might get a stale value for a new entry.
-
-Fixes: 435f2e7cc0b7 ("net: bridge: add support for sticky fdb entries")
-Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- net/bridge/br_fdb.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/net/bridge/br_fdb.c
-+++ b/net/bridge/br_fdb.c
-@@ -512,6 +512,7 @@ static struct net_bridge_fdb_entry *fdb_
-               if (is_static)
-                       set_bit(BR_FDB_STATIC, &fdb->flags);
-               fdb->offloaded = 0;
-+              fdb->is_sticky = 0;
-               fdb->updated = fdb->used = jiffies;
-               if (rhashtable_lookup_insert_fast(&br->fdb_hash_tbl,
-                                                 &fdb->rhnode,

diff --git a/queue-4.19/series b/queue-4.19/series
index eebc5ca96685bbf0b45c5ace9ca5120dde0493a5..09396705154a778d84ffc25893375f9f65b4199a 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -92,5 +92,4 @@ drm-i915-fence-mark-debug_fence_free-with-__maybe_un.patch
 rtmutex-drop-rt_mutex-wait_lock-before-scheduling.patch
 net-sunrpc-remap-eperm-in-case-of-connection-failure-in-xs_tcp_setup_socket.patch
 cx82310_eth-fix-error-return-code-in-cx82310_bind.patch
-net-bridge-explicitly-zero-is_sticky-in-fdb_create.patch
 netns-restore-ops-before-calling-ops_exit_list.patch