diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2008-08-17 13:48:37 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2008-10-23 01:55:19 -0400 |
commit | 8569c9140bd41089f9b6be8837ca421102714a90 (patch) | |
tree | cd289b322b215fe2ca2530aa320febfd99388d7f /arch/um/include/net_kern.h | |
parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) |
x86, um: take arch/um/include/* out of the way
We can't just plop asm/* into it - userland helpers are built with it
in search path and seeing asm/* show up there suddenly would be a bad
idea.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/um/include/net_kern.h')
-rw-r--r-- | arch/um/include/net_kern.h | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/arch/um/include/net_kern.h b/arch/um/include/net_kern.h deleted file mode 100644 index d843c7924a7c..000000000000 --- a/arch/um/include/net_kern.h +++ /dev/null | |||
@@ -1,70 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2002 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) | ||
3 | * Licensed under the GPL | ||
4 | */ | ||
5 | |||
6 | #ifndef __UM_NET_KERN_H | ||
7 | #define __UM_NET_KERN_H | ||
8 | |||
9 | #include <linux/netdevice.h> | ||
10 | #include <linux/platform_device.h> | ||
11 | #include <linux/skbuff.h> | ||
12 | #include <linux/socket.h> | ||
13 | #include <linux/list.h> | ||
14 | #include <linux/workqueue.h> | ||
15 | |||
16 | struct uml_net { | ||
17 | struct list_head list; | ||
18 | struct net_device *dev; | ||
19 | struct platform_device pdev; | ||
20 | int index; | ||
21 | unsigned char mac[ETH_ALEN]; | ||
22 | }; | ||
23 | |||
24 | struct uml_net_private { | ||
25 | struct list_head list; | ||
26 | spinlock_t lock; | ||
27 | struct net_device *dev; | ||
28 | struct timer_list tl; | ||
29 | struct net_device_stats stats; | ||
30 | struct work_struct work; | ||
31 | int fd; | ||
32 | unsigned char mac[ETH_ALEN]; | ||
33 | int max_packet; | ||
34 | unsigned short (*protocol)(struct sk_buff *); | ||
35 | int (*open)(void *); | ||
36 | void (*close)(int, void *); | ||
37 | void (*remove)(void *); | ||
38 | int (*read)(int, struct sk_buff *skb, struct uml_net_private *); | ||
39 | int (*write)(int, struct sk_buff *skb, struct uml_net_private *); | ||
40 | |||
41 | void (*add_address)(unsigned char *, unsigned char *, void *); | ||
42 | void (*delete_address)(unsigned char *, unsigned char *, void *); | ||
43 | char user[0]; | ||
44 | }; | ||
45 | |||
46 | struct net_kern_info { | ||
47 | void (*init)(struct net_device *, void *); | ||
48 | unsigned short (*protocol)(struct sk_buff *); | ||
49 | int (*read)(int, struct sk_buff *skb, struct uml_net_private *); | ||
50 | int (*write)(int, struct sk_buff *skb, struct uml_net_private *); | ||
51 | }; | ||
52 | |||
53 | struct transport { | ||
54 | struct list_head list; | ||
55 | const char *name; | ||
56 | int (* const setup)(char *, char **, void *); | ||
57 | const struct net_user_info *user; | ||
58 | const struct net_kern_info *kern; | ||
59 | const int private_size; | ||
60 | const int setup_size; | ||
61 | }; | ||
62 | |||
63 | extern struct net_device *ether_init(int); | ||
64 | extern unsigned short ether_protocol(struct sk_buff *); | ||
65 | extern int tap_setup_common(char *str, char *type, char **dev_name, | ||
66 | char **mac_out, char **gate_addr); | ||
67 | extern void register_transport(struct transport *new); | ||
68 | extern unsigned short eth_protocol(struct sk_buff *skb); | ||
69 | |||
70 | #endif | ||