[src/trunk]: src/sys/dev/marvell Fix a bug that a multicast filter entry is i...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/00f7e81d742f
branches:  trunk
changeset: 783544:00f7e81d742f
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri Dec 28 08:16:53 2012 +0000

description:
Fix a bug that a multicast filter entry is incorrectly overrode
on some cases.

diffstat:

 sys/dev/marvell/if_mvgbe.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (32 lines):

diff -r bf905050a0d5 -r 00f7e81d742f sys/dev/marvell/if_mvgbe.c
--- a/sys/dev/marvell/if_mvgbe.c        Fri Dec 28 08:03:59 2012 +0000
+++ b/sys/dev/marvell/if_mvgbe.c        Fri Dec 28 08:16:53 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_mvgbe.c,v 1.33 2012/12/20 10:01:28 msaitoh Exp $    */
+/*     $NetBSD: if_mvgbe.c,v 1.34 2012/12/28 08:16:53 msaitoh 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.33 2012/12/20 10:01:28 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.34 2012/12/28 08:16:53 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -2059,11 +2059,11 @@
                /* 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);
                }