From 61a9491643b9d256b3f1d34c2e96df52a9c12f76 Mon Sep 17 00:00:00 2001 From: Arnaud Patard Date: Tue, 9 Jan 2007 15:35:24 -0800 Subject: [PATCH] ipt_IDLETIMER: worqueue fixes This patch fixes the build of ipt_ILDETIMER with current omap -git Signed-off-by: Arnaud Patard Signed-off-by: Tony Lindgren --- net/ipv4/netfilter/ipt_IDLETIMER.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/net/ipv4/netfilter/ipt_IDLETIMER.c b/net/ipv4/netfilter/ipt_IDLETIMER.c index 7fd85cc67ef..a493858450f 100644 --- a/net/ipv4/netfilter/ipt_IDLETIMER.c +++ b/net/ipv4/netfilter/ipt_IDLETIMER.c @@ -33,6 +33,7 @@ #include #include #include +#include #if 0 #define DEBUGP(format, args...) printk("%s:%s:" format, \ @@ -68,9 +69,9 @@ static void utimer_delete(struct utimer_t *timer) kfree(timer); } -static void utimer_work(void * data) +static void utimer_work(struct work_struct *work) { - struct utimer_t *timer = (struct utimer_t *) data; + struct utimer_t *timer = container_of(work, struct utimer_t, work); struct net_device *netdev; netdev = dev_get_by_name(timer->name); @@ -110,7 +111,7 @@ static struct utimer_t *utimer_create(const char *name) timer->timer.function = utimer_expired; timer->timer.data = (unsigned long) timer; - INIT_WORK(&timer->work, utimer_work, timer); + INIT_WORK(&timer->work, utimer_work); DEBUGP("Created timer '%s'\n", timer->name); -- 2.41.1