diff options
Diffstat (limited to 'arch/um/include/net_kern.h')
-rw-r--r-- | arch/um/include/net_kern.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/um/include/net_kern.h b/arch/um/include/net_kern.h index 9237056b9103..d843c7924a7c 100644 --- a/arch/um/include/net_kern.h +++ b/arch/um/include/net_kern.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2002 Jeff Dike (jdike@karaya.com) | 2 | * Copyright (C) 2002 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) |
3 | * Licensed under the GPL | 3 | * Licensed under the GPL |
4 | */ | 4 | */ |
5 | 5 | ||
@@ -30,24 +30,24 @@ struct uml_net_private { | |||
30 | struct work_struct work; | 30 | struct work_struct work; |
31 | int fd; | 31 | int fd; |
32 | unsigned char mac[ETH_ALEN]; | 32 | unsigned char mac[ETH_ALEN]; |
33 | int max_packet; | ||
33 | unsigned short (*protocol)(struct sk_buff *); | 34 | unsigned short (*protocol)(struct sk_buff *); |
34 | int (*open)(void *); | 35 | int (*open)(void *); |
35 | void (*close)(int, void *); | 36 | void (*close)(int, void *); |
36 | void (*remove)(void *); | 37 | void (*remove)(void *); |
37 | int (*read)(int, struct sk_buff **skb, struct uml_net_private *); | 38 | int (*read)(int, struct sk_buff *skb, struct uml_net_private *); |
38 | int (*write)(int, struct sk_buff **skb, struct uml_net_private *); | 39 | int (*write)(int, struct sk_buff *skb, struct uml_net_private *); |
39 | 40 | ||
40 | void (*add_address)(unsigned char *, unsigned char *, void *); | 41 | void (*add_address)(unsigned char *, unsigned char *, void *); |
41 | void (*delete_address)(unsigned char *, unsigned char *, void *); | 42 | void (*delete_address)(unsigned char *, unsigned char *, void *); |
42 | int (*set_mtu)(int mtu, void *); | ||
43 | char user[0]; | 43 | char user[0]; |
44 | }; | 44 | }; |
45 | 45 | ||
46 | struct net_kern_info { | 46 | struct net_kern_info { |
47 | void (*init)(struct net_device *, void *); | 47 | void (*init)(struct net_device *, void *); |
48 | unsigned short (*protocol)(struct sk_buff *); | 48 | unsigned short (*protocol)(struct sk_buff *); |
49 | int (*read)(int, struct sk_buff **skb, struct uml_net_private *); | 49 | int (*read)(int, struct sk_buff *skb, struct uml_net_private *); |
50 | int (*write)(int, struct sk_buff **skb, struct uml_net_private *); | 50 | int (*write)(int, struct sk_buff *skb, struct uml_net_private *); |
51 | }; | 51 | }; |
52 | 52 | ||
53 | struct transport { | 53 | struct transport { |
@@ -62,7 +62,6 @@ struct transport { | |||
62 | 62 | ||
63 | extern struct net_device *ether_init(int); | 63 | extern struct net_device *ether_init(int); |
64 | extern unsigned short ether_protocol(struct sk_buff *); | 64 | extern unsigned short ether_protocol(struct sk_buff *); |
65 | extern struct sk_buff *ether_adjust_skb(struct sk_buff *skb, int extra); | ||
66 | extern int tap_setup_common(char *str, char *type, char **dev_name, | 65 | extern int tap_setup_common(char *str, char *type, char **dev_name, |
67 | char **mac_out, char **gate_addr); | 66 | char **mac_out, char **gate_addr); |
68 | extern void register_transport(struct transport *new); | 67 | extern void register_transport(struct transport *new); |