lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:

	drivers/net/s2io.c
This commit is contained in:
David S. Miller
2008-04-02 22:35:23 -07:00
parent c0f39322c3 802fb176d8
commit e1ec1b8ccd
55 changed files with 286 additions and 687 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/usb/dm9601.c
View File

@ -354,7 +354,7 @@ static void dm9601_set_multicast(struct net_device *net)
struct dev_mc_list *mc_list = net->mc_list;
int i;
for (i = 0; i < net->mc_count; i++) {
for (i = 0; i < net->mc_count; i++, mc_list = mc_list->next) {
u32 crc = ether_crc(ETH_ALEN, mc_list->dmi_addr) >> 26;
hashes[crc >> 3] |= 1 << (crc & 0x7);
}