[packages/ipset.git] / kernel-5.1.patch

--- ipset-7.1/kernel/net/netfilter/ipset/ip_set_hash_gen.h~	2018-12-10 18:35:31.000000000 +0100
+++ ipset-7.1/kernel/net/netfilter/ipset/ip_set_hash_gen.h	2019-05-07 18:42:08.063827159 +0200
@@ -666,8 +666,11 @@
 	spin_unlock_bh(&set->lock);
 
 	/* Give time to other readers of the set */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
+	synchronize_rcu();
+#else
 	synchronize_rcu_bh();
-
+#endif
 	pr_debug("set %s resized from %u (%p) to %u (%p)\n", set->name,
 		 orig->htable_bits, orig, t->htable_bits, t);
 	/* If there's nobody else dumping the table, destroy it */
Commit	Line	Data
7ee29dfc JR	1	--- ipset-7.1/kernel/net/netfilter/ipset/ip_set_hash_gen.h~ 2018-12-10 18:35:31.000000000 +0100
	2	+++ ipset-7.1/kernel/net/netfilter/ipset/ip_set_hash_gen.h 2019-05-07 18:42:08.063827159 +0200
	3	@@ -666,8 +666,11 @@
	4	spin_unlock_bh(&set->lock);
	5
	6	/* Give time to other readers of the set */
	7	+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
	8	+ synchronize_rcu();
	9	+#else
	10	synchronize_rcu_bh();
	11	-
	12	+#endif
	13	pr_debug("set %s resized from %u (%p) to %u (%p)\n", set->name,
	14	orig->htable_bits, orig, t->htable_bits, t);
	15	/* If there's nobody else dumping the table, destroy it */