uml: network formatting

[linux-2.6-omap-h63xx.git] / arch / um / drivers / slip_kern.c

diff --git a/arch/um/drivers/slip_kern.c b/arch/um/drivers/slip_kern.c
index 788da5439a2defd3b18837e74828b3ec75457ef6..05ed351de6b5f54cfb8f47686380df2fbc21814a 100644 (file)
--- a/arch/um/drivers/slip_kern.c
+++ b/arch/um/drivers/slip_kern.c
@@ -1,11 +1,12 @@
-#include "linux/kernel.h"
-#include "linux/stddef.h"
-#include "linux/init.h"
-#include "linux/netdevice.h"
-#include "linux/if_arp.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 "net_kern.h"
-#include "net_user.h"
-#include "kern.h"
 #include "slip.h"
 
 struct slip_init {
@@ -43,21 +44,21 @@ void slip_init(struct net_device *dev, void *data)
 
 static unsigned short slip_protocol(struct sk_buff *skbuff)
 {
-       return(htons(ETH_P_IP));
+       return htons(ETH_P_IP);
 }
 
-static int slip_read(int fd, struct sk_buff **skb, 
+static int slip_read(int fd, struct sk_buff **skb,
                       struct uml_net_private *lp)
 {
-       return(slip_user_read(fd, (*skb)->mac.raw, (*skb)->dev->mtu, 
-                             (struct slip_data *) &lp->user));
+       return slip_user_read(fd, skb_mac_header(*skb), (*skb)->dev->mtu,
+                             (struct slip_data *) &lp->user);
 }
 
 static int slip_write(int fd, struct sk_buff **skb,
                      struct uml_net_private *lp)
 {
-       return(slip_user_write(fd, (*skb)->data, (*skb)->len, 
-                              (struct slip_data *) &lp->user));
+       return slip_user_write(fd, (*skb)->data, (*skb)->len,
+                              (struct slip_data *) &lp->user);
 }
 
 const struct net_kern_info slip_kern_info = {
@@ -71,12 +72,11 @@ static int slip_setup(char *str, char **mac_out, void *data)
 {
        struct slip_init *init = data;
 
-       *init = ((struct slip_init)
-               { .gate_addr            = NULL });
+       *init = ((struct slip_init) { .gate_addr = NULL });
 
-       if(str[0] != '\0') 
+       if (str[0] != '\0')
                init->gate_addr = str;
-       return(1);
+       return 1;
 }
 
 static struct transport slip_transport = {
@@ -95,4 +95,4 @@ static int register_slip(void)
        return 0;
 }
 
-__initcall(register_slip);
+late_initcall(register_slip);