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 217438c..ffc6416 100644 (file)
--- a/arch/um/drivers/mcast_kern.c
+++ b/arch/um/drivers/mcast_kern.c
@@ -1,24 +1,20 @@
 /*
  * user-mode-linux networking multicast transport
  * Copyright (C) 2001 by Harald Welte <laforge@gnumonks.org>
+ * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  *
  * based on the existing uml-networking code, which is
- * Copyright (C) 2001 Lennert Buytenhek (buytenh@gnu.org) and 
+ * Copyright (C) 2001 Lennert Buytenhek (buytenh@gnu.org) and
  * James Leu (jleu@mindspring.net).
  * Copyright (C) 2001 by various other people who didn't put their name here.
  *
  * Licensed under the GPL.
  */
 
-#include "linux/kernel.h"
 #include "linux/init.h"
-#include "linux/netdevice.h"
-#include "linux/etherdevice.h"
-#include "linux/in.h"
-#include "linux/inet.h"
-#include "net_kern.h"
-#include "net_user.h"
+#include <linux/netdevice.h>
 #include "mcast.h"
+#include "net_kern.h"
 
 struct mcast_init {
        char *addr;
@@ -26,49 +22,43 @@ struct mcast_init {
        int ttl;
 };
 
-void mcast_init(struct net_device *dev, void *data)
+static void mcast_init(struct net_device *dev, void *data)
 {
        struct uml_net_private *pri;
        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;
        dpri->ttl = init->ttl;
        dpri->dev = dev;
 
-       printk("mcast backend ");
-       printk("multicast adddress: %s:%u, TTL:%u ",
+       printk("mcast backend multicast address: %s:%u, TTL:%u\n",
               dpri->addr, dpri->port, dpri->ttl);
-
-       printk("\n");
 }
 
-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.raw, 
-                           (*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, 
-                                (struct mcast_data *) &lp->user);
+       return mcast_user_write(fd, skb->data, skb->len,
+                               (struct mcast_data *) &lp->user);
 }
 
-static struct net_kern_info mcast_kern_info = {
+static const struct net_kern_info mcast_kern_info = {
        .init                   = mcast_init,
        .protocol               = eth_protocol,
        .read                   = mcast_read,
        .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;
@@ -81,34 +71,34 @@ int mcast_setup(char *str, char **mac_out, void *data)
 
        remain = split_if_spec(str, mac_out, &init->addr, &port_str, &ttl_str,
                               NULL);
-       if(remain != NULL){
+       if (remain != NULL) {
                printk(KERN_ERR "mcast_setup - Extra garbage on "
                       "specification : '%s'\n", remain);
-               return(0);
+               return 0;
        }
-       
-       if(port_str != NULL){
+
+       if (port_str != NULL) {
                init->port = simple_strtoul(port_str, &last, 10);
-               if((*last != '\0') || (last == port_str)){
-                       printk(KERN_ERR "mcast_setup - Bad port : '%s'\n", 
+               if ((*last != '\0') || (last == port_str)) {
+                       printk(KERN_ERR "mcast_setup - Bad port : '%s'\n",
                               port_str);
-                       return(0);
+                       return 0;
                }
        }
 
-       if(ttl_str != NULL){
+       if (ttl_str != NULL) {
                init->ttl = simple_strtoul(ttl_str, &last, 10);
-               if((*last != '\0') || (last == ttl_str)){
-                       printk(KERN_ERR "mcast_setup - Bad ttl : '%s'\n", 
+               if ((*last != '\0') || (last == ttl_str)) {
+                       printk(KERN_ERR "mcast_setup - Bad ttl : '%s'\n",
                               ttl_str);
-                       return(0);
+                       return 0;
                }
        }
 
        printk(KERN_INFO "Configured mcast device: %s:%u-%u\n", init->addr,
               init->port, init->ttl);
 
-       return(1);
+       return 1;
 }
 
 static struct transport mcast_transport = {
@@ -124,18 +114,7 @@ static struct transport mcast_transport = {
 static int register_mcast(void)
 {
        register_transport(&mcast_transport);
-       return(1);
+       return 0;
 }
 
-__initcall(register_mcast);
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
+late_initcall(register_mcast);