SAM9 watchdog: update for moved headers

[linux-2.6-omap-h63xx.git] / net / rose / rose_dev.c

diff --git a/net/rose/rose_dev.c b/net/rose/rose_dev.c
index 7c279e2659eca174aefaee1e8d942516ac5e6427..12cfcf09556ba25a22185b99a25060a24548312e 100644 (file)
--- a/net/rose/rose_dev.c
+++ b/net/rose/rose_dev.c
@@ -9,7 +9,6 @@
 #include <linux/module.h>
 #include <linux/proc_fs.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/interrupt.h>
 #include <linux/fs.h>
 #include <linux/types.h>
@@ -36,8 +35,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);
 
@@ -55,13 +55,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);
        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;
        }
@@ -93,20 +93,34 @@ static int rose_rebuild_header(struct sk_buff *skb)
 static int rose_set_mac_address(struct net_device *dev, void *addr)
 {
        struct sockaddr *sa = addr;
+       int err;
 
-       rose_del_loopback_node((rose_address *)dev->dev_addr);
+       if (!memcpy(dev->dev_addr, sa->sa_data, dev->addr_len))
+               return 0;
 
-       memcpy(dev->dev_addr, sa->sa_data, dev->addr_len);
+       if (dev->flags & IFF_UP) {
+               err = rose_add_loopback_node((rose_address *)dev->dev_addr);
+               if (err)
+                       return err;
 
-       rose_add_loopback_node((rose_address *)dev->dev_addr);
+               rose_del_loopback_node((rose_address *)dev->dev_addr);
+       }
+
+       memcpy(dev->dev_addr, sa->sa_data, dev->addr_len);
 
        return 0;
 }
 
 static int rose_open(struct net_device *dev)
 {
+       int err;
+
+       err = rose_add_loopback_node((rose_address *)dev->dev_addr);
+       if (err)
+               return err;
+
        netif_start_queue(dev);
-       rose_add_loopback_node((rose_address *)dev->dev_addr);
+
        return 0;
 }
 
@@ -135,6 +149,11 @@ 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,
+};
+
 void rose_setup(struct net_device *dev)
 {
        dev->mtu                = ROSE_MAX_PACKET_SIZE - 2;
@@ -142,11 +161,10 @@ void rose_setup(struct net_device *dev)
        dev->open               = rose_open;
        dev->stop               = rose_close;
 
-       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. */