summaryrefslogtreecommitdiffstats
path: root/drivers/net/s2io.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-04 12:07:07 -0500
committerJeff Garzik <jeff@garzik.org>2006-03-04 12:07:07 -0500
commitfb15b9dd8b3f44290a7b3b06fdfd4be2ad73f0ac (patch)
treecab2d85fb0ebfa33ee20e5738e11f58c0b1e16cd /drivers/net/s2io.c
parentc3cf560e35509634d72cf809074834d5ea23ab66 (diff)
parenta7a80d5ad3735554338199b9d976dfda5c10d3c7 (diff)
downloadop-kernel-dev-fb15b9dd8b3f44290a7b3b06fdfd4be2ad73f0ac.zip
op-kernel-dev-fb15b9dd8b3f44290a7b3b06fdfd4be2ad73f0ac.tar.gz
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/net/s2io.c')
-rw-r--r--drivers/net/s2io.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 99ce70d..79208f4 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -4160,6 +4160,7 @@ static void s2io_set_multicast(struct net_device *dev)
i++, mclist = mclist->next) {
memcpy(sp->usr_addrs[i].addr, mclist->dmi_addr,
ETH_ALEN);
+ mac_addr = 0;
for (j = 0; j < ETH_ALEN; j++) {
mac_addr |= mclist->dmi_addr[j];
mac_addr <<= 8;
OpenPOWER on IntegriCloud