diff options
author | 2008-04-02 22:35:23 -0700 | |
---|---|---|
committer | 2008-04-02 22:35:23 -0700 | |
commit | e1ec1b8ccdf0df6000faa8c2d985ca5f94157e5a (patch) | |
tree | 4e1ca325dde22f1ac21c9da0be509e87e922e604 /drivers/net/usb/dm9601.c | |
parent | [NETNS]: Do not include net/net_namespace.h from seq_file.h (diff) | |
parent | [VLAN]: Proc entry is not renamed when vlan device name changes. (diff) | |
download | linux-e1ec1b8ccdf0df6000faa8c2d985ca5f94157e5a.tar.gz linux-e1ec1b8ccdf0df6000faa8c2d985ca5f94157e5a.tar.bz2 linux-e1ec1b8ccdf0df6000faa8c2d985ca5f94157e5a.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/s2io.c
Diffstat (limited to 'drivers/net/usb/dm9601.c')
-rw-r--r-- | drivers/net/usb/dm9601.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c index 2968bb342ea3..f7319d326912 100644 --- a/drivers/net/usb/dm9601.c +++ b/drivers/net/usb/dm9601.c @@ -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); } |