[PATCH 2.6.22.3 2/5] nfnetlink_log: Flush queue early

[PATCH 2.6.22.3 2/5] nfnetlink_log: Flush queue early

[Michał Mirosław]

If queue is filled to its threshold, then flush it right away instead
of waiting for timer or next packet.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>                                                               

--- lq1/net/netfilter/nfnetlink_log.c	2007-09-21 13:27:28.000000000 +0200
+++ rechot/net/netfilter/nfnetlink_log.c	2007-09-20 15:14:04.000000000 +0200
@@ -644,8 +627,7 @@
 		goto unlock_and_release;
 	}
 
-	if (inst->qlen >= qthreshold ||
-	    (inst->skb && size > skb_tailroom(inst->skb))) {
+	if (inst->skb && size > skb_tailroom(inst->skb)) {
 		/* either the queue len is too high or we don't have
 		 * enough room in the skb left. flush to userspace. */
 		UDEBUG("flushing old skb\n");
@@ -665,9 +647,11 @@
 	__build_packet_message(inst, skb, data_len, pf,
 				hooknum, in, out, li, prefix, plen);
 
+	if (inst->qlen >= qthreshold)
+		__nfulnl_flush(inst);
 	/* timer_pending always called within inst->lock, so there
 	 * is no chance of a race here */
-	if (!timer_pending(&inst->timer)) {
+	else if (!timer_pending(&inst->timer)) {
 		instance_get(inst);
 		inst->timer.expires = jiffies + (inst->flushtimeout*HZ/100);
 		add_timer(&inst->timer);
-
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 2.6.22.3 2/5] nfnetlink_log: Flush queue early

[Patrick McHardy]

Micha³ Miros³aw wrote:
> If queue is filled to its threshold, then flush it right away instead
> of waiting for timer or next packet.


Applied, thanks Michal.
-
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html