diff options
Diffstat (limited to 'net/rose/rose_dev.c')
-rw-r--r-- | net/rose/rose_dev.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/rose/rose_dev.c b/net/rose/rose_dev.c index 178ff4f73c85..906cc05bba63 100644 --- a/net/rose/rose_dev.c +++ b/net/rose/rose_dev.c | |||
@@ -21,7 +21,6 @@ | |||
21 | #include <linux/if_ether.h> | 21 | #include <linux/if_ether.h> |
22 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
23 | 23 | ||
24 | #include <asm/system.h> | ||
25 | #include <asm/io.h> | 24 | #include <asm/io.h> |
26 | 25 | ||
27 | #include <linux/inet.h> | 26 | #include <linux/inet.h> |
@@ -96,11 +95,11 @@ static int rose_set_mac_address(struct net_device *dev, void *addr) | |||
96 | struct sockaddr *sa = addr; | 95 | struct sockaddr *sa = addr; |
97 | int err; | 96 | int err; |
98 | 97 | ||
99 | if (!memcpy(dev->dev_addr, sa->sa_data, dev->addr_len)) | 98 | if (!memcmp(dev->dev_addr, sa->sa_data, dev->addr_len)) |
100 | return 0; | 99 | return 0; |
101 | 100 | ||
102 | if (dev->flags & IFF_UP) { | 101 | if (dev->flags & IFF_UP) { |
103 | err = rose_add_loopback_node((rose_address *)dev->dev_addr); | 102 | err = rose_add_loopback_node((rose_address *)sa->sa_data); |
104 | if (err) | 103 | if (err) |
105 | return err; | 104 | return err; |
106 | 105 | ||