From e41306bb6f1156b9170b262e5a79a16ed3c3edd9 Mon Sep 17 00:00:00 2001 From: Kristoffer Glembo Date: Mon, 4 Jul 2011 21:39:10 -0700 Subject: [PATCH] --- yaml --- r: 254682 b: refs/heads/master c: 9b9cfe7cf663c16c0d93349cc0094bb28ae7135a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/greth.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 53e8b564c90b..c4c4eb353e3b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c349a528cd47e2272ded0ea358363855e86180da +refs/heads/master: 9b9cfe7cf663c16c0d93349cc0094bb28ae7135a diff --git a/trunk/drivers/net/greth.c b/trunk/drivers/net/greth.c index f181304a7ab6..672f096fe090 100644 --- a/trunk/drivers/net/greth.c +++ b/trunk/drivers/net/greth.c @@ -1015,11 +1015,10 @@ static int greth_set_mac_add(struct net_device *dev, void *p) return -EINVAL; memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); + GRETH_REGSAVE(regs->esa_msb, dev->dev_addr[0] << 8 | dev->dev_addr[1]); + GRETH_REGSAVE(regs->esa_lsb, dev->dev_addr[2] << 24 | dev->dev_addr[3] << 16 | + dev->dev_addr[4] << 8 | dev->dev_addr[5]); - GRETH_REGSAVE(regs->esa_msb, addr->sa_data[0] << 8 | addr->sa_data[1]); - GRETH_REGSAVE(regs->esa_lsb, - addr->sa_data[2] << 24 | addr-> - sa_data[3] << 16 | addr->sa_data[4] << 8 | addr->sa_data[5]); return 0; }