summaryrefslogtreecommitdiffstats
path: root/net/bridge
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2007-03-23 11:16:30 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-25 22:27:43 -0700
commite6f689db51a789807edede411b32eb7c9e457948 (patch)
tree6ba28587853721dc617d7f71ab622ac54eb4cd9d /net/bridge
parent9afdb00c80b0b9c20435ce690b5287fa2434ef44 (diff)
downloadlinux-e6f689db51a789807edede411b32eb7c9e457948.tar.bz2
[NETFILTER]: Use setup_timer
Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
-rw-r--r--net/bridge/netfilter/ebt_ulog.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c
index 259f5c370f3c..8b84cd40279e 100644
--- a/net/bridge/netfilter/ebt_ulog.c
+++ b/net/bridge/netfilter/ebt_ulog.c
@@ -297,9 +297,7 @@ static int __init ebt_ulog_init(void)
/* initialize ulog_buffers */
for (i = 0; i < EBT_ULOG_MAXNLGROUPS; i++) {
- init_timer(&ulog_buffers[i].timer);
- ulog_buffers[i].timer.function = ulog_timer;
- ulog_buffers[i].timer.data = i;
+ setup_timer(&ulog_buffers[i].timer, ulog_timer, i);
spin_lock_init(&ulog_buffers[i].lock);
}