From 40a761f11fdb9925a6fd799bf7dadf3aa5e4a2ee Mon Sep 17 00:00:00 2001 From: "danborkmann@iogearbox.net" Date: Tue, 27 Mar 2012 22:47:43 +0000 Subject: [PATCH] --- yaml --- r: 298480 b: refs/heads/master c: 81213b5e8ae68e204aa7a3f83c4f9100405dbff9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/rose/rose_dev.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fb885402bd4a..6764706f5a04 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 464b57da56910c8737ede75ad820b9a7afc46b3e +refs/heads/master: 81213b5e8ae68e204aa7a3f83c4f9100405dbff9 diff --git a/trunk/net/rose/rose_dev.c b/trunk/net/rose/rose_dev.c index 178ff4f73c85..2679507ad333 100644 --- a/trunk/net/rose/rose_dev.c +++ b/trunk/net/rose/rose_dev.c @@ -96,11 +96,11 @@ static int rose_set_mac_address(struct net_device *dev, void *addr) struct sockaddr *sa = addr; int err; - if (!memcpy(dev->dev_addr, sa->sa_data, dev->addr_len)) + if (!memcmp(dev->dev_addr, sa->sa_data, dev->addr_len)) return 0; if (dev->flags & IFF_UP) { - err = rose_add_loopback_node((rose_address *)dev->dev_addr); + err = rose_add_loopback_node((rose_address *)sa->sa_data); if (err) return err;