1 files changed, 14 insertions, 21 deletions

diff --git a/arch/um/os-Linux/drivers/tuntap_kern.c b/arch/um/os-Linux/drivers/tuntap_kern.c
index f1714e7fb1d0..9d384807b077 100644
--- a/arch/um/os-Linux/drivers/tuntap_kern.c
+++ b/arch/um/os-Linux/drivers/tuntap_kern.c
@@ -1,16 +1,13 @@
-/* 
- * Copyright (C) 2001 Jeff Dike (jdike@karaya.com)
+/*
+ * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * Licensed under the GPL
  */
 
-#include "linux/stddef.h"
-#include "linux/netdevice.h"
-#include "linux/etherdevice.h"
-#include "linux/skbuff.h"
-#include "linux/init.h"
-#include "asm/errno.h"
+#include <linux/netdevice.h>
+#include <linux/init.h>
+#include <linux/skbuff.h>
+#include <asm/errno.h>
 #include "net_kern.h"
-#include "net_user.h"
 #include "tuntap.h"
 
 struct tuntap_init {
@@ -38,19 +35,15 @@ static void tuntap_init(struct net_device *dev, void *data)
         printk("\n");
 }
 
-static int tuntap_read(int fd, struct sk_buff **skb, 
-                       struct uml_net_private *lp)
+static int tuntap_read(int fd, struct sk_buff *skb, struct uml_net_private *lp)
 {
-        *skb = ether_adjust_skb(*skb, ETH_HEADER_OTHER);
-        if(*skb == NULL) return(-ENOMEM);
-        return(net_read(fd, skb_mac_header(*skb),
-                        (*skb)->dev->mtu + ETH_HEADER_OTHER));
+        return net_read(fd, skb_mac_header(skb),
+                        skb->dev->mtu + ETH_HEADER_OTHER);
 }
 
-static int tuntap_write(int fd, struct sk_buff **skb, 
-                        struct uml_net_private *lp)
+static int tuntap_write(int fd, struct sk_buff *skb, struct uml_net_private *lp)
 {
-        return(net_write(fd, (*skb)->data, (*skb)->len));
+        return net_write(fd, skb->data, skb->len);
 }
 
 const struct net_kern_info tuntap_kern_info = {
@@ -67,11 +60,11 @@ int tuntap_setup(char *str, char **mac_out, void *data)
         *init = ((struct tuntap_init)
                 { .dev_name     = NULL,
                   .gate_addr    = NULL });
-        if(tap_setup_common(str, "tuntap", &init->dev_name, mac_out,
+        if (tap_setup_common(str, "tuntap", &init->dev_name, mac_out,
                             &init->gate_addr))
-                return(0);
+                return 0;
 
-        return(1);
+        return 1;
 }
 
 static struct transport tuntap_transport = {