uml: network formatting

[sfrench/cifs-2.6.git] / arch / um / drivers / slirp_kern.c

diff --git a/arch/um/drivers/slirp_kern.c b/arch/um/drivers/slirp_kern.c
index 0a0324a6d290355e30847c0ca670b2f2f6d01689..b208d5e4a405d97806720a7c519b2e3a4e389999 100644 (file)
--- a/arch/um/drivers/slirp_kern.c
+++ b/arch/um/drivers/slirp_kern.c
@@ -1,11 +1,14 @@
-#include "linux/kernel.h"
-#include "linux/stddef.h"
+/*
+ * Copyright (C) 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
+ * Licensed under the GPL.
+ */
+
+#include <linux/if_arp.h>
 #include "linux/init.h"
-#include "linux/netdevice.h"
-#include "linux/if_arp.h"
+#include <linux/netdevice.h>
+#include <linux/string.h>
 #include "net_kern.h"
 #include "net_user.h"
-#include "kern.h"
 #include "slirp.h"
 
 struct slirp_init {
@@ -39,29 +42,28 @@ void slirp_init(struct net_device *dev, void *data)
        dev->tx_queue_len = 256;
        dev->flags = IFF_NOARP;
        printk("SLIRP backend - command line:");
-       for(i=0;spri->argw.argv[i]!=NULL;i++) {
+       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));
+       return htons(ETH_P_IP);
 }
 
-static int slirp_read(int fd, struct sk_buff **skb, 
+static int slirp_read(int fd, struct sk_buff **skb,
                       struct uml_net_private *lp)
 {
-       return(slirp_user_read(fd, skb_mac_header(*skb), (*skb)->dev->mtu,
-                             (struct slirp_data *) &lp->user));
+       return slirp_user_read(fd, skb_mac_header(*skb), (*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));
+       return slirp_user_write(fd, (*skb)->data, (*skb)->len,
+                              (struct slirp_data *) &lp->user);
 }
 
 const struct net_kern_info slirp_kern_info = {
@@ -76,31 +78,32 @@ 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  } } });
+       *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);
-       }
+       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");
+               if (i >= SLIRP_MAX_ARGS - 1) {
+                       printk(KERN_WARNING "slirp_setup: truncating slirp "
+                              "arguments\n");
                        break;
                }
                init->argw.argv[i++] = str;
                while(*str && *str!=',') {
-                       if(*str=='_') *str=' ';
+                       if (*str == '_')
+                               *str=' ';
                        str++;
                }
-               if(*str!=',')
+               if (*str != ',')
                        break;
-               *str++='\0';
-       } while(1);
-       init->argw.argv[i]=NULL;
-       return(1);
+               *str++ = '\0';
+       } while (1);
+
+       init->argw.argv[i] = NULL;
+       return 1;
 }
 
 static struct transport slirp_transport = {