GFS2: Use DEFINE_SPINLOCK

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

diff --git a/arch/um/drivers/mcast_kern.c b/arch/um/drivers/mcast_kern.c
index 5027b87..ffc6416 100644 (file)
--- a/arch/um/drivers/mcast_kern.c
+++ b/arch/um/drivers/mcast_kern.c
@@ -28,7 +28,7 @@ static void mcast_init(struct net_device *dev, void *data)
        struct mcast_data *dpri;
        struct mcast_init *init = data;
 
-       pri = dev->priv;
+       pri = netdev_priv(dev);
        dpri = (struct mcast_data *) pri->user;
        dpri->addr = init->addr;
        dpri->port = init->port;
@@ -39,18 +39,15 @@ static void mcast_init(struct net_device *dev, void *data)
               dpri->addr, dpri->port, dpri->ttl);
 }
 
-static int mcast_read(int fd, struct sk_buff **skb, struct uml_net_private *lp)
+static int mcast_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_recvfrom(fd, skb_mac_header(*skb),
-                           (*skb)->dev->mtu + ETH_HEADER_OTHER);
+       return net_recvfrom(fd, skb_mac_header(skb),
+                           skb->dev->mtu + ETH_HEADER_OTHER);
 }
 
-static int mcast_write(int fd, struct sk_buff **skb, struct uml_net_private *lp)
+static int mcast_write(int fd, struct sk_buff *skb, struct uml_net_private *lp)
 {
-       return mcast_user_write(fd, (*skb)->data, (*skb)->len,
+       return mcast_user_write(fd, skb->data, skb->len,
                                (struct mcast_data *) &lp->user);
 }
 
@@ -61,7 +58,7 @@ static const struct net_kern_info mcast_kern_info = {
        .write                  = mcast_write,
 };
 
-int mcast_setup(char *str, char **mac_out, void *data)
+static int mcast_setup(char *str, char **mac_out, void *data)
 {
        struct mcast_init *init = data;
        char *port_str = NULL, *ttl_str = NULL, *remain;