diff --git a/[refs] b/[refs]
index 8b6e6cf3582f..776baa6b759b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31729363418ea25b01aa9410838c38e36792e44c
+refs/heads/master: 3b5bcedeeb755b6e813537fcf4c32f010b490aef
diff --git a/trunk/drivers/net/niu.c b/trunk/drivers/net/niu.c
index 2fe14b0c5c67..1f1b815e0813 100644
--- a/trunk/drivers/net/niu.c
+++ b/trunk/drivers/net/niu.c
@@ -5147,7 +5147,12 @@ static void niu_set_rx_mode(struct net_device *dev)
 			index++;
 		}
 	} else {
-		for (i = 0; i < niu_num_alt_addr(np); i++) {
+		int alt_start;
+		if (np->flags & NIU_FLAGS_XMAC)
+			alt_start = 0;
+		else
+			alt_start = 1;
+		for (i = alt_start; i < niu_num_alt_addr(np); i++) {
 			err = niu_enable_alt_mac(np, i, 0);
 			if (err)
 				printk(KERN_WARNING PFX "%s: Error %d "