Linux-2.6.12-rc2v2.6.12-rc2

Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.

Let it rip!

1 files changed, 135 insertions, 0 deletions

diff --git a/arch/um/drivers/slirp_kern.c b/arch/um/drivers/slirp_kern.c
new file mode 100644
index 000000000000..c9d6b52a831d
--- /dev/null
+++ b/arch/um/drivers/slirp_kern.c
@@ -0,0 +1,135 @@
+#include "linux/kernel.h"
+#include "linux/stddef.h"
+#include "linux/init.h"
+#include "linux/netdevice.h"
+#include "linux/if_arp.h"
+#include "net_kern.h"
+#include "net_user.h"
+#include "kern.h"
+#include "slirp.h"
+
+struct slirp_init {
+        struct arg_list_dummy_wrapper argw;  /* XXX should be simpler... */
+};
+
+void slirp_init(struct net_device *dev, void *data)
+{
+        struct uml_net_private *private;
+        struct slirp_data *spri;
+        struct slirp_init *init = data;
+        int i;
+
+        private = dev->priv;
+        spri = (struct slirp_data *) private->user;
+        *spri = ((struct slirp_data)
+                { .argw         = init->argw,
+                  .pid          = -1,
+                  .slave        = -1,
+                  .ibuf         = { '\0' },
+                  .obuf         = { '\0' },
+                  .pos          = 0,
+                  .esc          = 0,
+                  .dev          = dev });
+
+        dev->init = NULL;
+        dev->hard_header_len = 0;
+        dev->header_cache_update = NULL;
+        dev->hard_header_cache = NULL;
+        dev->hard_header = NULL;
+        dev->addr_len = 0;
+        dev->type = ARPHRD_SLIP;
+        dev->tx_queue_len = 256;
+        dev->flags = IFF_NOARP;
+        printk("SLIRP backend - command line:");
+        for(i=0;spri->argw.argv[i]!=NULL;i++) {
+                printk(" '%s'",spri->argw.argv[i]);
+        }
+        printk("\n");
+}
+
+static unsigned short slirp_protocol(struct sk_buff *skbuff)
+{
+        return(htons(ETH_P_IP));
+}
+
+static int slirp_read(int fd, struct sk_buff **skb, 
+                       struct uml_net_private *lp)
+{
+        return(slirp_user_read(fd, (*skb)->mac.raw, (*skb)->dev->mtu, 
+                              (struct slirp_data *) &lp->user));
+}
+
+static int slirp_write(int fd, struct sk_buff **skb,
+                      struct uml_net_private *lp)
+{
+        return(slirp_user_write(fd, (*skb)->data, (*skb)->len, 
+                               (struct slirp_data *) &lp->user));
+}
+
+struct net_kern_info slirp_kern_info = {
+        .init                   = slirp_init,
+        .protocol               = slirp_protocol,
+        .read                   = slirp_read,
+        .write                  = slirp_write,
+};
+
+static int slirp_setup(char *str, char **mac_out, void *data)
+{
+        struct slirp_init *init = data;
+        int i=0;
+
+        *init = ((struct slirp_init)
+                { argw :                { { "slirp", NULL  } } });
+
+        str = split_if_spec(str, mac_out, NULL);
+
+        if(str == NULL) { /* no command line given after MAC addr */
+                return(1);
+        }
+
+        do {
+                if(i>=SLIRP_MAX_ARGS-1) {
+                        printk("slirp_setup: truncating slirp arguments\n");
+                        break;
+                }
+                init->argw.argv[i++] = str;
+                while(*str && *str!=',') {
+                        if(*str=='_') *str=' ';
+                        str++;
+                }
+                if(*str!=',')
+                        break;
+                *str++='\0';
+        } while(1);
+        init->argw.argv[i]=NULL;
+        return(1);
+}
+
+static struct transport slirp_transport = {
+        .list           = LIST_HEAD_INIT(slirp_transport.list),
+        .name           = "slirp",
+        .setup          = slirp_setup,
+        .user           = &slirp_user_info,
+        .kern           = &slirp_kern_info,
+        .private_size   = sizeof(struct slirp_data),
+        .setup_size     = sizeof(struct slirp_init),
+};
+
+static int register_slirp(void)
+{
+        register_transport(&slirp_transport);
+        return(1);
+}
+
+__initcall(register_slirp);
+
+/*
+ * Overrides for Emacs so that we follow Linus's tabbing style.
+ * Emacs will notice this stuff at the end of the file and automatically
+ * adjust the settings for this buffer only.  This must remain at the end
+ * of the file.
+ * ---------------------------------------------------------------------------
+ * Local variables:
+ * c-file-style: "linux"
+ * End:
+ */