From dfdcd77d37ec790141206aecc1139f3abc6c6fbb Mon Sep 17 00:00:00 2001 From: Matheos Worku Date: Wed, 20 Feb 2008 00:18:09 -0800 Subject: [PATCH] --- yaml --- r: 86277 b: refs/heads/master c: fa907895b7b776208a1406efe5ba7ffe0f49f507 h: refs/heads/master i: 86275: 036a9b877ec27496f7c996c2ffc2fee8a4298a8c v: v3 --- [refs] | 2 +- trunk/drivers/net/niu.c | 9 +++++---- trunk/drivers/net/niu.h | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 72281d4e90b8..780833731a03 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b33ed22194d8f0dbcf682f5cdf5b9c2ef551e7c +refs/heads/master: fa907895b7b776208a1406efe5ba7ffe0f49f507 diff --git a/trunk/drivers/net/niu.c b/trunk/drivers/net/niu.c index e98ce1e4965b..d11ba61baa4f 100644 --- a/trunk/drivers/net/niu.c +++ b/trunk/drivers/net/niu.c @@ -1616,12 +1616,13 @@ static int niu_enable_alt_mac(struct niu *np, int index, int on) if (index >= niu_num_alt_addr(np)) return -EINVAL; - if (np->flags & NIU_FLAGS_XMAC) + if (np->flags & NIU_FLAGS_XMAC) { reg = XMAC_ADDR_CMPEN; - else + mask = 1 << index; + } else { reg = BMAC_ADDR_CMPEN; - - mask = 1 << index; + mask = 1 << (index + 1); + } val = nr64_mac(reg); if (on) diff --git a/trunk/drivers/net/niu.h b/trunk/drivers/net/niu.h index 0e8626adc573..59dc05fcd371 100644 --- a/trunk/drivers/net/niu.h +++ b/trunk/drivers/net/niu.h @@ -499,7 +499,7 @@ #define BMAC_ADDR2 0x00110UL #define BMAC_ADDR2_ADDR2 0x000000000000ffffULL -#define BMAC_NUM_ALT_ADDR 7 +#define BMAC_NUM_ALT_ADDR 6 #define BMAC_ALT_ADDR0(NUM) (0x00118UL + (NUM)*0x18UL) #define BMAC_ALT_ADDR0_ADDR0 0x000000000000ffffULL