aboutsummaryrefslogtreecommitdiff
path: root/arch/um/include/net_kern.h
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2006-12-13 00:33:50 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-13 09:05:47 -0800
commiteff3b634d9a0cccb6ca8b431819fa415f10804dc (patch)
tree8bf2dac62ce9c4e4aa62ea5a66831ed65ef35137 /arch/um/include/net_kern.h
parentffd22b8e08fb86692d316cdcc1a4da4d10a016c5 (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/net_kern.h')
-rw-r--r--arch/um/include/net_kern.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/um/include/net_kern.h b/arch/um/include/net_kern.h
index 280459fb0b2..218f8b47fdc 100644
--- a/arch/um/include/net_kern.h
+++ b/arch/um/include/net_kern.h
@@ -11,6 +11,7 @@
#include <linux/skbuff.h>
#include <linux/socket.h>
#include <linux/list.h>
+#include <linux/workqueue.h>
struct uml_net {
struct list_head list;
@@ -26,6 +27,7 @@ struct uml_net_private {
struct net_device *dev;
struct timer_list tl;
struct net_device_stats stats;
+ struct work_struct work;
int fd;
unsigned char mac[ETH_ALEN];
unsigned short (*protocol)(struct sk_buff *);