Merge branch 'linus' into cont_syslog

[safe/jmp/linux-2.6] / net / rose / rose_dev.c

diff --git a/net/rose/rose_dev.c b/net/rose/rose_dev.c
index 8d88795..178ff4f 100644 (file)
--- a/net/rose/rose_dev.c
+++ b/net/rose/rose_dev.c
@@ -19,6 +19,7 @@
 #include <linux/fcntl.h>
 #include <linux/in.h>
 #include <linux/if_ether.h>
+#include <linux/slab.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
@@ -35,8 +36,9 @@
 #include <net/ax25.h>
 #include <net/rose.h>
 
-static int rose_header(struct sk_buff *skb, struct net_device *dev, unsigned short type,
-       void *daddr, void *saddr, unsigned len)
+static int rose_header(struct sk_buff *skb, struct net_device *dev,
+                      unsigned short type,
+                      const void *daddr, const void *saddr, unsigned len)
 {
        unsigned char *buff = skb_push(skb, ROSE_MIN_LEN + 2);
 
@@ -54,13 +56,13 @@ static int rose_header(struct sk_buff *skb, struct net_device *dev, unsigned sho
 
 static int rose_rebuild_header(struct sk_buff *skb)
 {
+#ifdef CONFIG_INET
        struct net_device *dev = skb->dev;
-       struct net_device_stats *stats = netdev_priv(dev);
+       struct net_device_stats *stats = &dev->stats;
        unsigned char *bp = (unsigned char *)skb->data;
        struct sk_buff *skbn;
        unsigned int len;
 
-#ifdef CONFIG_INET
        if (arp_find(bp + 7, skb)) {
                return 1;
        }
@@ -130,39 +132,41 @@ static int rose_close(struct net_device *dev)
        return 0;
 }
 
-static int rose_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t rose_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-       struct net_device_stats *stats = netdev_priv(dev);
+       struct net_device_stats *stats = &dev->stats;
 
        if (!netif_running(dev)) {
                printk(KERN_ERR "ROSE: rose_xmit - called when iface is down\n");
-               return 1;
+               return NETDEV_TX_BUSY;
        }
        dev_kfree_skb(skb);
        stats->tx_errors++;
-       return 0;
+       return NETDEV_TX_OK;
 }
 
-static struct net_device_stats *rose_get_stats(struct net_device *dev)
-{
-       return netdev_priv(dev);
-}
+static const struct header_ops rose_header_ops = {
+       .create = rose_header,
+       .rebuild= rose_rebuild_header,
+};
+
+static const struct net_device_ops rose_netdev_ops = {
+       .ndo_open               = rose_open,
+       .ndo_stop               = rose_close,
+       .ndo_start_xmit         = rose_xmit,
+       .ndo_set_mac_address    = rose_set_mac_address,
+};
 
 void rose_setup(struct net_device *dev)
 {
        dev->mtu                = ROSE_MAX_PACKET_SIZE - 2;
-       dev->hard_start_xmit    = rose_xmit;
-       dev->open               = rose_open;
-       dev->stop               = rose_close;
+       dev->netdev_ops         = &rose_netdev_ops;
 
-       dev->hard_header        = rose_header;
+       dev->header_ops         = &rose_header_ops;
        dev->hard_header_len    = AX25_BPQ_HEADER_LEN + AX25_MAX_HEADER_LEN + ROSE_MIN_LEN;
        dev->addr_len           = ROSE_ADDR_LEN;
        dev->type               = ARPHRD_ROSE;
-       dev->rebuild_header     = rose_rebuild_header;
-       dev->set_mac_address    = rose_set_mac_address;
 
        /* New-style flags. */
        dev->flags              = IFF_NOARP;
-       dev->get_stats = rose_get_stats;
 }