Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

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

diff --git a/arch/um/drivers/slip_kern.c b/arch/um/drivers/slip_kern.c
index 125c44f776383bf5ec024277793af182acb7385b..5ec17563142e22cc6f6ff1e3ec76db23666d3ec9 100644 (file)
--- a/arch/um/drivers/slip_kern.c
+++ b/arch/um/drivers/slip_kern.c
@@ -1,24 +1,25 @@
-#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 {
        char *gate_addr;
 };
 
-void slip_init(struct net_device *dev, void *data)
+static void slip_init(struct net_device *dev, void *data)
 {
        struct uml_net_private *private;
        struct slip_data *spri;
        struct slip_init *init = data;
 
-       private = dev->priv;
+       private = netdev_priv(dev);
        spri = (struct slip_data *) private->user;
 
        memset(spri->name, 0, sizeof(spri->name));
@@ -30,10 +31,8 @@ void slip_init(struct net_device *dev, void *data)
        slip_proto_init(&spri->slip);
 
        dev->init = NULL;
-       dev->header_cache_update = NULL;
-       dev->hard_header_cache = NULL;
-       dev->hard_header = NULL;
        dev->hard_header_len = 0;
+       dev->header_ops = NULL;
        dev->addr_len = 0;
        dev->type = ARPHRD_SLIP;
        dev->tx_queue_len = 256;
@@ -43,24 +42,22 @@ 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, 
-                      struct uml_net_private *lp)
+static int slip_read(int fd, struct sk_buff *skb, struct uml_net_private *lp)
 {
-       return(slip_user_read(fd, skb_mac_header(*skb), (*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)
+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 = {
+static const struct net_kern_info slip_kern_info = {
        .init                   = slip_init,
        .protocol               = slip_protocol,
        .read                   = slip_read,
@@ -71,12 +68,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 = {