2 files changed, 6 insertions, 5 deletions

diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index e98ce1e4965b..d11ba61baa4f 100644
--- a/drivers/net/niu.c
+++ b/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/drivers/net/niu.h b/drivers/net/niu.h
index 0e8626adc573..59dc05fcd371 100644
--- a/drivers/net/niu.h
+++ b/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