[PATCH] ipt_IDLETIMER: worqueue fixes

[PATCH] ipt_IDLETIMER: worqueue fixes

[Arnaud Patard]

[-- Attachment #1: Type: text/plain, Size: 129 bytes --]

This patch fixes the build of ipt_ILDETIMER with current omap -git

Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
---

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: idle_timer_workqueue.patch --]
[-- Type: text/x-patch, Size: 1313 bytes --]

---
 net/ipv4/netfilter/ipt_IDLETIMER.c |    7 	4 +	3 -	0 !
 1 file changed, 4 insertions(+), 3 deletions(-)

Index: linux-omap-2.6/net/ipv4/netfilter/ipt_IDLETIMER.c
===================================================================
--- linux-omap-2.6.orig/net/ipv4/netfilter/ipt_IDLETIMER.c	2007-01-07 14:10:28.000000000 +0100
+++ linux-omap-2.6/net/ipv4/netfilter/ipt_IDLETIMER.c	2007-01-07 14:12:25.000000000 +0100
@@ -33,6 +33,7 @@
 #include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter_ipv4/ipt_IDLETIMER.h>
 #include <linux/kobject.h>
+#include <linux/workqueue.h>
 
 #if 0
 #define DEBUGP(format, args...) printk("%s:%s:" format, \
@@ -68,9 +69,9 @@ static void utimer_delete(struct utimer_
 	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(co
 	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);
 

[-- Attachment #3: Type: text/plain, Size: 0 bytes --]

Re: [PATCH] ipt_IDLETIMER: worqueue fixes

[Tony Lindgren]

* Arnaud Patard <arnaud.patard@rtp-net.org> [070108 02:21]:
> This patch fixes the build of ipt_ILDETIMER with current omap -git
> 
> Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
> ---

> ---
>  net/ipv4/netfilter/ipt_IDLETIMER.c |    7 	4 +	3 -	0 !
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> Index: linux-omap-2.6/net/ipv4/netfilter/ipt_IDLETIMER.c
> ===================================================================
> --- linux-omap-2.6.orig/net/ipv4/netfilter/ipt_IDLETIMER.c	2007-01-07 14:10:28.000000000 +0100
> +++ linux-omap-2.6/net/ipv4/netfilter/ipt_IDLETIMER.c	2007-01-07 14:12:25.000000000 +0100
> @@ -33,6 +33,7 @@
>  #include <linux/netfilter_ipv4/ip_tables.h>
>  #include <linux/netfilter_ipv4/ipt_IDLETIMER.h>
>  #include <linux/kobject.h>
> +#include <linux/workqueue.h>
>  
>  #if 0
>  #define DEBUGP(format, args...) printk("%s:%s:" format, \
> @@ -68,9 +69,9 @@ static void utimer_delete(struct utimer_
>  	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(co
>  	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);
>  

Pushing today.

Tony