diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-20 18:24:29 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-20 18:24:29 -0400 |
| commit | e77c8e83dd587f2616d7ff20d23a897891e6e20d (patch) | |
| tree | ba5d2ce6541119f329b2fd51181aaae8528b38f0 /drivers/net/ks8851.c | |
| parent | 641cb85e68945878d520d5fc3c2dc64aa1dda868 (diff) | |
| parent | af98441397227a5a4f212cd48710eea72a14dbdb (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/ks8851.c')
| -rw-r--r-- | drivers/net/ks8851.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ks8851.c b/drivers/net/ks8851.c index 6f414824caf7..66be4e449f02 100644 --- a/drivers/net/ks8851.c +++ b/drivers/net/ks8851.c | |||
| @@ -966,7 +966,6 @@ static void ks8851_set_rx_mode(struct net_device *dev) | |||
| 966 | crc >>= (32 - 6); /* get top six bits */ | 966 | crc >>= (32 - 6); /* get top six bits */ |
| 967 | 967 | ||
| 968 | rxctrl.mchash[crc >> 4] |= (1 << (crc & 0xf)); | 968 | rxctrl.mchash[crc >> 4] |= (1 << (crc & 0xf)); |
| 969 | mcptr = mcptr->next; | ||
| 970 | } | 969 | } |
| 971 | 970 | ||
| 972 | rxctrl.rxcr1 = RXCR1_RXME | RXCR1_RXPAFMA; | 971 | rxctrl.rxcr1 = RXCR1_RXME | RXCR1_RXPAFMA; |