Module Name: src
Committed By: riz
Date: Mon Jan 7 16:45:30 UTC 2013
Modified Files:
src/sys/dev/marvell [netbsd-6]: if_mvgbe.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #775):
sys/dev/marvell/if_mvgbe.c: revision 1.34
Fix a bug that a multicast filter entry is incorrectly overrode
on some cases.
To generate a diff of this commit:
cvs rdiff -u -r1.16.2.2 -r1.16.2.3 src/sys/dev/marvell/if_mvgbe.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/marvell/if_mvgbe.c
diff -u src/sys/dev/marvell/if_mvgbe.c:1.16.2.2 src/sys/dev/marvell/if_mvgbe.c:1.16.2.3
--- src/sys/dev/marvell/if_mvgbe.c:1.16.2.2 Sat Jan 5 23:32:27 2013
+++ src/sys/dev/marvell/if_mvgbe.c Mon Jan 7 16:45:30 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mvgbe.c,v 1.16.2.2 2013/01/05 23:32:27 riz Exp $ */
+/* $NetBSD: if_mvgbe.c,v 1.16.2.3 2013/01/07 16:45:30 riz Exp $ */
/*
* Copyright (c) 2007, 2008 KIYOHARA Takashi
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.16.2.2 2013/01/05 23:32:27 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.16.2.3 2013/01/07 16:45:30 riz Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -1966,11 +1966,11 @@ mvgbe_filter_setup(struct mvgbe_softc *s
/* chip handles some IPv4 multicast specially */
if (memcmp(enm->enm_addrlo, special, 5) == 0) {
i = enm->enm_addrlo[5];
- dfsmt[i>>2] =
+ dfsmt[i>>2] |=
MVGBE_DF(i&3, MVGBE_DF_QUEUE(0) | MVGBE_DF_PASS);
} else {
i = mvgbe_crc8(enm->enm_addrlo, ETHER_ADDR_LEN);
- dfomt[i>>2] =
+ dfomt[i>>2] |=
MVGBE_DF(i&3, MVGBE_DF_QUEUE(0) | MVGBE_DF_PASS);
}
