[netfilter-cvslog] r7366 - trunk/conntrack-tools/src

[pablo at netfilter.org]

Author: pablo at netfilter.org
Date: 2008-02-14 15:24:09 +0100 (Thu, 14 Feb 2008)
New Revision: 7366

Modified:
   trunk/conntrack-tools/src/alarm.c
Log:
From: Max Kellermann <max at duempel.org>
make alarm_run_queue a local variable


Modified: trunk/conntrack-tools/src/alarm.c
===================================================================
--- trunk/conntrack-tools/src/alarm.c	2008-02-14 14:21:46 UTC (rev 7365)
+++ trunk/conntrack-tools/src/alarm.c	2008-02-14 14:24:09 UTC (rev 7366)
@@ -21,7 +21,6 @@
 #include <limits.h>
 
 static struct rb_root alarm_root = RB_ROOT;
-static LIST_HEAD(alarm_run_queue);
 
 void init_alarm(struct alarm_block *t,
 		void *data,
@@ -122,12 +121,14 @@
 struct timeval *
 do_alarm_run(struct timeval *next_run)
 {
+	struct list_head alarm_run_queue;
 	struct rb_node *node;
 	struct alarm_block *this, *tmp;
 	struct timeval tv;
 
 	gettimeofday(&tv, NULL);
 
+	INIT_LIST_HEAD(&alarm_run_queue);
 	for (node = rb_first(&alarm_root); node; node = rb_next(node)) {
 		this = container_of(node, struct alarm_block, node);