Merge branch 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (26 commits)
  x86: canonicalize remaining header guards
  x86: drop double underscores from header guards
  x86: Fix ASM_X86__ header guards
  x86, um: get rid of uml-config.h
  x86, um: get rid of arch/um/Kconfig.arch
  x86, um: get rid of arch/um/os symlink
  x86, um: get rid of excessive includes of uml-config.h
  x86, um: get rid of header symlinks
  x86, um: merge Kconfig.i386 and Kconfig.x86_64
  x86, um: get rid of sysdep symlink
  x86, um: trim the junk from uml ptrace-*.h
  x86, um: take vm-flags.h to sysdep
  x86, um: get rid of uml asm/arch
  x86, um: get rid of uml highmem.h
  x86, um: get rid of uml unistd.h
  x86, um: get rid of system.h -> system.h include
  x86, um: uml atomic.h is not needed anymore
  x86, um: untangle uml ldt.h
  x86, um: get rid of more uml asm/arch uses
  x86, um: remove dead header (uml module-generic.h; never used these days)
  ...

1 files changed, 70 insertions, 0 deletions

diff --git a/arch/um/include/shared/net_kern.h b/arch/um/include/shared/net_kern.h
new file mode 100644
index 000000000000..d843c7924a7c
--- /dev/null
+++ b/arch/um/include/shared/net_kern.h
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2002 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
+ * Licensed under the GPL
+ */
+
+#ifndef __UM_NET_KERN_H
+#define __UM_NET_KERN_H
+
+#include <linux/netdevice.h>
+#include <linux/platform_device.h>
+#include <linux/skbuff.h>
+#include <linux/socket.h>
+#include <linux/list.h>
+#include <linux/workqueue.h>
+
+struct uml_net {
+        struct list_head list;
+        struct net_device *dev;
+        struct platform_device pdev;
+        int index;
+        unsigned char mac[ETH_ALEN];
+};
+
+struct uml_net_private {
+        struct list_head list;
+        spinlock_t lock;
+        struct net_device *dev;
+        struct timer_list tl;
+        struct net_device_stats stats;
+        struct work_struct work;
+        int fd;
+        unsigned char mac[ETH_ALEN];
+        int max_packet;
+        unsigned short (*protocol)(struct sk_buff *);
+        int (*open)(void *);
+        void (*close)(int, void *);
+        void (*remove)(void *);
+        int (*read)(int, struct sk_buff *skb, struct uml_net_private *);
+        int (*write)(int, struct sk_buff *skb, struct uml_net_private *);
+
+        void (*add_address)(unsigned char *, unsigned char *, void *);
+        void (*delete_address)(unsigned char *, unsigned char *, void *);
+        char user[0];
+};
+
+struct net_kern_info {
+        void (*init)(struct net_device *, void *);
+        unsigned short (*protocol)(struct sk_buff *);
+        int (*read)(int, struct sk_buff *skb, struct uml_net_private *);
+        int (*write)(int, struct sk_buff *skb, struct uml_net_private *);
+};
+
+struct transport {
+        struct list_head list;
+        const char *name;
+        int (* const setup)(char *, char **, void *);
+        const struct net_user_info *user;
+        const struct net_kern_info *kern;
+        const int private_size;
+        const int setup_size;
+};
+
+extern struct net_device *ether_init(int);
+extern unsigned short ether_protocol(struct sk_buff *);
+extern int tap_setup_common(char *str, char *type, char **dev_name,
+                            char **mac_out, char **gate_addr);
+extern void register_transport(struct transport *new);
+extern unsigned short eth_protocol(struct sk_buff *skb);
+
+#endif