From a7698ca79a9f0fde82fe611ceec56b06c2f3282f Mon Sep 17 00:00:00 2001 From: Eric Leblond Date: Wed, 29 Nov 2006 02:35:33 +0100 Subject: [PATCH] --- yaml --- r: 41935 b: refs/heads/master c: 829e17a1a602572ffa3beefe582dc103ee9fb9c7 h: refs/heads/master i: 41933: 3f517cb6b7306ccdea36a160cda34d226d084545 41931: 5f6a37b1513fb1f58bd7e9b5c825154ecbcb881f 41927: 6c91f302f38bb53a04d9509d739caa49d067d98b 41919: 0fe4f61f2d9e64b277ddc12798e3c0b73ee83e46 v: v3 --- [refs] | 2 +- trunk/include/linux/netfilter/nfnetlink_queue.h | 1 + trunk/net/netfilter/nfnetlink_queue.c | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a7b10aba3e20..7af43d977fb0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b621c1ea64a54f77b8a841b16dc4c9fee3ecf48 +refs/heads/master: 829e17a1a602572ffa3beefe582dc103ee9fb9c7 diff --git a/trunk/include/linux/netfilter/nfnetlink_queue.h b/trunk/include/linux/netfilter/nfnetlink_queue.h index 4beea3d6fda8..83e789633e35 100644 --- a/trunk/include/linux/netfilter/nfnetlink_queue.h +++ b/trunk/include/linux/netfilter/nfnetlink_queue.h @@ -82,6 +82,7 @@ enum nfqnl_attr_config { NFQA_CFG_UNSPEC, NFQA_CFG_CMD, /* nfqnl_msg_config_cmd */ NFQA_CFG_PARAMS, /* nfqnl_msg_config_params */ + NFQA_CFG_QUEUE_MAXLEN, /* u_int32_t */ __NFQA_CFG_MAX }; #define NFQA_CFG_MAX (__NFQA_CFG_MAX-1) diff --git a/trunk/net/netfilter/nfnetlink_queue.c b/trunk/net/netfilter/nfnetlink_queue.c index 82e4454659bf..a88a017da22c 100644 --- a/trunk/net/netfilter/nfnetlink_queue.c +++ b/trunk/net/netfilter/nfnetlink_queue.c @@ -947,6 +947,14 @@ nfqnl_recv_config(struct sock *ctnl, struct sk_buff *skb, ntohl(params->copy_range)); } + if (nfqa[NFQA_CFG_QUEUE_MAXLEN-1]) { + __be32 *queue_maxlen; + queue_maxlen = NFA_DATA(nfqa[NFQA_CFG_QUEUE_MAXLEN-1]); + spin_lock_bh(&queue->lock); + queue->queue_maxlen = ntohl(*queue_maxlen); + spin_unlock_bh(&queue->lock); + } + out_put: instance_put(queue); return ret;