mv643xx_eth: fix multicast filter programming
diff mbox

Message ID 20090119095813.GF17124@xi.wantstofly.org
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Lennert Buytenhek Jan. 19, 2009, 9:58 a.m. UTC
Commit 66e63ffbc04706568d8789cbb00eaa8ddbcae648 ("mv643xx_eth:
implement ->set_rx_mode()") cleaned up mv643xx_eth's multicast filter
programming, but broke it as well.

The non-special multicast filter table (for multicast addresses that
are not of the form 01:00:5e:00:00:xx) consists of 256 hash table
buckets organised as 64 32-bit words, where the 'accept' bits are
in the LSB of each byte, so in bits 24 16 8 0 of each 32-bit word.
The old code got this right, but the referenced commit broke this by
using bits 3 2 1 0 instead.  This commit fixes this up.

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
 drivers/net/mv643xx_eth.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

David Miller Jan. 20, 2009, 1:17 a.m. UTC | #1
From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Mon, 19 Jan 2009 10:58:13 +0100

> Commit 66e63ffbc04706568d8789cbb00eaa8ddbcae648 ("mv643xx_eth:
> implement ->set_rx_mode()") cleaned up mv643xx_eth's multicast filter
> programming, but broke it as well.
> 
> The non-special multicast filter table (for multicast addresses that
> are not of the form 01:00:5e:00:00:xx) consists of 256 hash table
> buckets organised as 64 32-bit words, where the 'accept' bits are
> in the LSB of each byte, so in bits 24 16 8 0 of each 32-bit word.
> The old code got this right, but the referenced commit broke this by
> using bits 3 2 1 0 instead.  This commit fixes this up.
> 
> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index e2aa468..8c6979a 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -1596,7 +1596,7 @@  oom:
 			entry = addr_crc(a);
 		}
 
-		table[entry >> 2] |= 1 << (entry & 3);
+		table[entry >> 2] |= 1 << (8 * (entry & 3));
 	}
 
 	for (i = 0; i < 0x100; i += 4) {