sparc64: Use a seperate counter for timer interrupts and NMI checks, like x86.

[safe/jmp/linux-2.6] / arch / um / drivers / vde_kern.c

diff --git a/arch/um/drivers/vde_kern.c b/arch/um/drivers/vde_kern.c
index eb8cf31..1b852bf 100644 (file)
--- a/arch/um/drivers/vde_kern.c
+++ b/arch/um/drivers/vde_kern.c
@@ -7,10 +7,8 @@
  *
  */
 
-#include "linux/kernel.h"
 #include "linux/init.h"
-#include "linux/netdevice.h"
-#include "linux/etherdevice.h"
+#include <linux/netdevice.h>
 #include "net_kern.h"
 #include "net_user.h"
 #include "vde.h"
@@ -21,7 +19,7 @@ static void vde_init(struct net_device *dev, void *data)
        struct uml_net_private *pri;
        struct vde_data *vpri;
 
-       pri = dev->priv;
+       pri = netdev_priv(dev);
        vpri = (struct vde_data *) pri->user;
 
        vpri->vde_switch = init->vde_switch;
@@ -30,38 +28,33 @@ static void vde_init(struct net_device *dev, void *data)
        vpri->conn = NULL;
        vpri->dev = dev;
 
-       printk(KERN_INFO "vde backend - %s, ", vpri->vde_switch ?
+       printk("vde backend - %s, ", vpri->vde_switch ?
               vpri->vde_switch : "(default socket)");
 
        vde_init_libstuff(vpri, init);
 
-       printk(KERN_INFO "\n");
+       printk("\n");
 }
 
-static int vde_read(int fd, struct sk_buff **skb, struct uml_net_private *lp)
+static int vde_read(int fd, struct sk_buff *skb, struct uml_net_private *lp)
 {
        struct vde_data *pri = (struct vde_data *) &lp->user;
 
-       if (pri->conn != NULL) {
-               *skb = ether_adjust_skb(*skb, ETH_HEADER_OTHER);
-               if (*skb == NULL)
-                       return -ENOMEM;
-
-               return vde_user_read(pri->conn, skb_mac_header(*skb),
-                                    (*skb)->dev->mtu + ETH_HEADER_OTHER);
-       }
+       if (pri->conn != NULL)
+               return vde_user_read(pri->conn, skb_mac_header(skb),
+                                    skb->dev->mtu + ETH_HEADER_OTHER);
 
        printk(KERN_ERR "vde_read - we have no VDECONN to read from");
        return -EBADF;
 }
 
-static int vde_write(int fd, struct sk_buff **skb, struct uml_net_private *lp)
+static int vde_write(int fd, struct sk_buff *skb, struct uml_net_private *lp)
 {
        struct vde_data *pri = (struct vde_data *) &lp->user;
 
        if (pri->conn != NULL)
-               return vde_user_write((void *)pri->conn, (*skb)->data,
-                                     (*skb)->len);
+               return vde_user_write((void *)pri->conn, skb->data,
+                                     skb->len);
 
        printk(KERN_ERR "vde_write - we have no VDECONN to write to");
        return -EBADF;