]> err.no Git - linux-2.6/commitdiff
[NIU]: Fix BMAC alternate MAC address indexing.
authorMatheos Worku <matheos.worku@sun.com>
Tue, 19 Feb 2008 05:30:03 +0000 (21:30 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 19 Feb 2008 05:30:03 +0000 (21:30 -0800)
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>
drivers/net/niu.c

index 2fe14b0c5c67956e05f01b69d54ebb7d7a194509..1f1b815e0813592530fc6c3f0493fe0fbcb35418 100644 (file)
@@ -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 "