Module Name: src
Committed By: christos
Date: Sun Dec 13 19:06:43 UTC 2015
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
PR/50527: David Binderman: Fix impossible code. Odd offsets need special
treatment.
To generate a diff of this commit:
cvs rdiff -u -r1.381 -r1.382 src/sys/dev/pci/if_wm.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/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.381 src/sys/dev/pci/if_wm.c:1.382
--- src/sys/dev/pci/if_wm.c:1.381 Fri Oct 30 15:22:01 2015
+++ src/sys/dev/pci/if_wm.c Sun Dec 13 14:06:43 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.381 2015/10/30 19:22:01 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.382 2015/12/13 19:06:43 christos Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.381 2015/10/30 19:22:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.382 2015/12/13 19:06:43 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -3105,7 +3105,7 @@ wm_set_filter(struct wm_softc *sc)
hash |= 1U << bit;
/* XXX Hardware bug?? */
- if (sc->sc_type == WM_T_82544 && (reg & 0xe) == 1) {
+ if (sc->sc_type == WM_T_82544 && (reg & 1) != 0) {
bit = CSR_READ(sc, mta_reg + ((reg - 1) << 2));
CSR_WRITE(sc, mta_reg + (reg << 2), hash);
CSR_WRITE(sc, mta_reg + ((reg - 1) << 2), bit);
