[src/netbsd-6]: src/sys/dev/marvell Pull up following revision(s) (requested ...

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

details:   https://anonhg.NetBSD.org/src/rev/033633900b4d
branches:  netbsd-6
changeset: 775615:033633900b4d
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Jan 07 16:45:30 2013 +0000

description:
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.

diffstat:

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

diffs (32 lines):

diff -r 8ad5a58dcb73 -r 033633900b4d sys/dev/marvell/if_mvgbe.c
--- a/sys/dev/marvell/if_mvgbe.c        Mon Jan 07 16:42:51 2013 +0000
+++ b/sys/dev/marvell/if_mvgbe.c        Mon Jan 07 16:45:30 2013 +0000
@@ -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 @@
                /* 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);
                }