diff options
author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2006-12-13 03:33:50 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-13 12:05:47 -0500 |
commit | eff3b634d9a0cccb6ca8b431819fa415f10804dc (patch) | |
tree | 8bf2dac62ce9c4e4aa62ea5a66831ed65ef35137 /arch/um/include | |
parent | ffd22b8e08fb86692d316cdcc1a4da4d10a016c5 (diff) |
[PATCH] uml: fix net_kern workqueue abuse
Fix up the work on stack and exit scope trouble by placing the work_struct
in the uml_net_private data.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/include')
-rw-r--r-- | arch/um/include/net_kern.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/um/include/net_kern.h b/arch/um/include/net_kern.h index 280459fb0b26..218f8b47fdcd 100644 --- a/arch/um/include/net_kern.h +++ b/arch/um/include/net_kern.h | |||
@@ -11,6 +11,7 @@ | |||
11 | #include <linux/skbuff.h> | 11 | #include <linux/skbuff.h> |
12 | #include <linux/socket.h> | 12 | #include <linux/socket.h> |
13 | #include <linux/list.h> | 13 | #include <linux/list.h> |
14 | #include <linux/workqueue.h> | ||
14 | 15 | ||
15 | struct uml_net { | 16 | struct uml_net { |
16 | struct list_head list; | 17 | struct list_head list; |
@@ -26,6 +27,7 @@ struct uml_net_private { | |||
26 | struct net_device *dev; | 27 | struct net_device *dev; |
27 | struct timer_list tl; | 28 | struct timer_list tl; |
28 | struct net_device_stats stats; | 29 | struct net_device_stats stats; |
30 | struct work_struct work; | ||
29 | int fd; | 31 | int fd; |
30 | unsigned char mac[ETH_ALEN]; | 32 | unsigned char mac[ETH_ALEN]; |
31 | unsigned short (*protocol)(struct sk_buff *); | 33 | unsigned short (*protocol)(struct sk_buff *); |