[ATALK]: Add alloc_ltalkdev().

this matches the API used by other link layer like ethernet or token
ring.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c
index 2161c2d585f0869e57ebfe101a49686f5ea36b4b..9edaa183227a36afb5f15737055e015631055d12 100644 (file)
--- a/drivers/net/appletalk/cops.c
+++ b/drivers/net/appletalk/cops.c
@@ -65,7 +65,7 @@ static const char *version =
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/if_arp.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/if_arp.h>

-#include <linux/if_ltalk.h>    /* For ltalk_setup() */
+#include <linux/if_ltalk.h>

 #include <linux/delay.h>       /* For udelay() */
 #include <linux/atalk.h>
 #include <linux/spinlock.h>
 #include <linux/delay.h>       /* For udelay() */
 #include <linux/atalk.h>
 #include <linux/spinlock.h>


@@ -223,7 +223,7 @@ struct net_device * __init cops_probe(int unit)
        int base_addr;
        int err = 0;
 
        int base_addr;
        int err = 0;
 

-       dev = alloc_netdev(sizeof(struct cops_local), "lt%d", ltalk_setup);
+       dev = alloc_ltalkdev(sizeof(struct cops_local));

        if (!dev)
                return ERR_PTR(-ENOMEM);
 
        if (!dev)
                return ERR_PTR(-ENOMEM);
 

diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c
index ad8e943231a1c3a93cb769fb3d1fad23baa40ac6..db4f369637b63f435bf04694e5641e9cf535281f 100644 (file)
--- a/drivers/net/appletalk/ltpc.c
+++ b/drivers/net/appletalk/ltpc.c
@@ -1039,7 +1039,7 @@ struct net_device * __init ltpc_probe(void)
        unsigned long f;
        unsigned long timeout;
 
        unsigned long f;
        unsigned long timeout;
 

-       dev = alloc_netdev(sizeof(struct ltpc_private), "lt%d", ltalk_setup);
+       dev = alloc_ltalkdev(sizeof(struct ltpc_private));

        if (!dev)
                goto out;
 
        if (!dev)
                goto out;
 

diff --git a/include/linux/if_ltalk.h b/include/linux/if_ltalk.h
index e75e832b7ff0dd56d79bb07029a89a16c067afa2..76525760ba48398550dc856ec90c9a2ca55a05a7 100644 (file)
--- a/include/linux/if_ltalk.h
+++ b/include/linux/if_ltalk.h
@@ -6,7 +6,7 @@
 #define LTALK_ALEN             1
 
 #ifdef __KERNEL__
 #define LTALK_ALEN             1
 
 #ifdef __KERNEL__

-extern void ltalk_setup(struct net_device *);
+extern struct net_device *alloc_ltalkdev(int sizeof_priv);

 #endif
 
 #endif
 #endif
 
 #endif

diff --git a/net/appletalk/dev.c b/net/appletalk/dev.c
index 76598445d84b1591279ea3467b68ebe119bb3684..1237e208e246a5ebcce6d69f524749472c4d3b06 100644 (file)
--- a/net/appletalk/dev.c
+++ b/net/appletalk/dev.c
@@ -19,7 +19,7 @@ static int ltalk_mac_addr(struct net_device *dev, void *addr)
        return -EINVAL;
 }
 
        return -EINVAL;
 }
 

-void ltalk_setup(struct net_device *dev)
+static void ltalk_setup(struct net_device *dev)

 {
        /* Fill in the fields of the device structure with localtalk-generic values. */
        
 {
        /* Fill in the fields of the device structure with localtalk-generic values. */
        


@@ -40,4 +40,22 @@ void ltalk_setup(struct net_device *dev)
 
        dev->flags              = IFF_BROADCAST|IFF_MULTICAST|IFF_NOARP;
 }
 
        dev->flags              = IFF_BROADCAST|IFF_MULTICAST|IFF_NOARP;
 }

-EXPORT_SYMBOL(ltalk_setup);
+
+/**
+ * alloc_ltalkdev - Allocates and sets up an localtalk device
+ * @sizeof_priv: Size of additional driver-private structure to be allocated
+ *     for this localtalk device
+ *
+ * Fill in the fields of the device structure with localtalk-generic
+ * values. Basically does everything except registering the device.
+ *
+ * Constructs a new net device, complete with a private data area of
+ * size @sizeof_priv.  A 32-byte (not bit) alignment is enforced for
+ * this private data area.
+ */
+
+struct net_device *alloc_ltalkdev(int sizeof_priv)
+{
+       return alloc_netdev(sizeof_priv, "lt%d", ltalk_setup);
+}
+EXPORT_SYMBOL(alloc_ltalkdev);