The following commit has been merged in the linux branch: commit b6a71bfa00eb110c8a2e38f85572ed361f8bf3a5 Author: Ben Dooks ben@simtec.co.uk Date: Mon Oct 19 23:49:05 2009 +0000

KS8851: Fix ks8851_set_rx_mode() for IFF_MULTICAST

In ks8851_set_rx_mode() the case handling IFF_MULTICAST was also setting the RXCR1_AE bit by accident. This meant that all unicast frames where being accepted by the device. Remove RXCR1_AE from this case.

Note, RXCR1_AE was also masking a problem with setting the MAC address properly, so needs to be applied after fixing the MAC write order.

Fixes a bug reported by Doong, Ping of Micrel. This version of the patch avoids setting RXCR1_ME for all cases.

Signed-off-by: Ben Dooks ben@simtec.co.uk Signed-off-by: David S. Miller davem@davemloft.net

diff --git a/drivers/net/ks8851.c b/drivers/net/ks8851.c index 29fa19a..a23f739 100644 --- a/drivers/net/ks8851.c +++ b/drivers/net/ks8851.c @@ -980,7 +980,7 @@ static void ks8851_set_rx_mode(struct net_device *dev) mcptr = mcptr->next; }

- rxctrl.rxcr1 = RXCR1_RXME | RXCR1_RXAE | RXCR1_RXPAFMA; + rxctrl.rxcr1 = RXCR1_RXME | RXCR1_RXPAFMA; } else { /* just accept broadcast / unicast */ rxctrl.rxcr1 = RXCR1_RXPAFMA;