[packages/kernel/LINUX_4_4] - updated IMQ patch

baggins baggins at pld-linux.org
Sun Feb 18 12:05:16 CET 2018


commit 9d421a2abc899c38b73a12bb1136d0973c1633e9
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Feb 18 12:04:53 2018 +0100

    - updated IMQ patch

 kernel-imq.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/kernel-imq.patch b/kernel-imq.patch
index e03658a5..12cfaa4d 100644
--- a/kernel-imq.patch
+++ b/kernel-imq.patch
@@ -1583,10 +1583,10 @@ index 5baa8e2..9740e8c 100644
  	int status = -ENOENT;
  	struct nf_queue_entry *entry = NULL;
 @@ -124,7 +142,17 @@ int nf_queue(struct sk_buff *skb,
- 	const struct nf_queue_handler *qh;
+ 	struct net *net = state->net;
  
  	/* QUEUE == DROP if no one is waiting, to be safe. */
--	qh = rcu_dereference(queue_handler);
+-	qh = rcu_dereference(net->nf.queue_handler);
 +	if (queuetype == NF_IMQ_QUEUE) {
 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
 +		qh = rcu_dereference(queue_imq_handler);
@@ -1595,7 +1595,7 @@ index 5baa8e2..9740e8c 100644
 +		goto err_unlock;
 +#endif
 +	} else {
-+		qh = rcu_dereference(queue_handler);
++		qh = rcu_dereference(net->nf.queue_handler);
 +	}
 +
  	if (!qh) {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/9d421a2abc899c38b73a12bb1136d0973c1633e9



More information about the pld-cvs-commit mailing list