Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763389AbYCUXrq (ORCPT ); Fri, 21 Mar 2008 19:47:46 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754780AbYCUXpj (ORCPT ); Fri, 21 Mar 2008 19:45:39 -0400 Received: from 216-99-217-87.dsl.aracnet.com ([216.99.217.87]:60187 "EHLO sous-sol.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752641AbYCUXp1 (ORCPT ); Fri, 21 Mar 2008 19:45:27 -0400 Message-Id: <20080321224332.857974471@sous-sol.org> References: <20080321224250.144333319@sous-sol.org> User-Agent: quilt/0.46-1 Date: Fri, 21 Mar 2008 15:42:56 -0700 From: Chris Wright To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Matheos Worku , David S Miller , Greg Kroah-Hartman Subject: [patch 06/76] NIU: Fix BMAC alternate MAC address indexing. Content-Disposition: inline; filename=niu-fix-bmac-alternate-mac-address-indexing.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1289 Lines: 42 -stable review patch. If anyone has any objections, please let us know. --------------------- From: Matheos Worku 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 Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman Signed-off-by: Chris Wright --- drivers/net/niu.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) --- a/drivers/net/niu.c +++ b/drivers/net/niu.c @@ -5148,7 +5148,12 @@ static void niu_set_rx_mode(struct net_d 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 " -- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/