From: Matheos Worku <matheos.worku@sun.com>
Date: Wed, 5 Mar 2008 22:47:36 +0000 (-0800)
Subject: NIU: Fix BMAC alternate MAC address indexing.
X-Git-Tag: v2.6.24.4~73
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6a9d3b1f4ec21b365f027d241bbfc871c4c91152;p=karo-tx-linux.git

NIU: Fix BMAC alternate MAC address indexing.

Upstream commit: 3b5bcedeeb755b6e813537fcf4c32f010b490aef

BMAC port alternate MAC address index needs to start at 1. Index 0 is
used for the main MAC address.

Signed-off-by: Matheos Worku <matheos.worku@sun.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
---

diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index faf87a010a1e..e6581941fb6c 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -5148,7 +5148,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 "