diff options
author | Ben Dooks <ben@simtec.co.uk> | 2009-10-19 19:49:05 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-10-20 22:11:07 -0400 |
commit | b6a71bfa00eb110c8a2e38f85572ed361f8bf3a5 (patch) | |
tree | 7c595c41e533971e361e76db259fb09282d6d7a0 /drivers/net/ks8851.c | |
parent | 160d0fadaf7ce20e5bad26c8a955504b93c6a5ba (diff) |
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>
Diffstat (limited to 'drivers/net/ks8851.c')
-rw-r--r-- | drivers/net/ks8851.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ks8851.c b/drivers/net/ks8851.c index 29fa19a076bd..a23f739d222f 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) | |||
980 | mcptr = mcptr->next; | 980 | mcptr = mcptr->next; |
981 | } | 981 | } |
982 | 982 | ||
983 | rxctrl.rxcr1 = RXCR1_RXME | RXCR1_RXAE | RXCR1_RXPAFMA; | 983 | rxctrl.rxcr1 = RXCR1_RXME | RXCR1_RXPAFMA; |
984 | } else { | 984 | } else { |
985 | /* just accept broadcast / unicast */ | 985 | /* just accept broadcast / unicast */ |
986 | rxctrl.rxcr1 = RXCR1_RXPAFMA; | 986 | rxctrl.rxcr1 = RXCR1_RXPAFMA; |