Module Name: src
Committed By: msaitoh
Date: Wed Mar 10 15:04:04 UTC 2010
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
82576 is dual port, so check the FUNCID and increment the MAC address for
the 2nd port.
To generate a diff of this commit:
cvs rdiff -u -r1.204 -r1.205 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.204 src/sys/dev/pci/if_wm.c:1.205
--- src/sys/dev/pci/if_wm.c:1.204 Sun Mar 7 10:11:04 2010
+++ src/sys/dev/pci/if_wm.c Wed Mar 10 15:04:04 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.204 2010/03/07 10:11:04 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.205 2010/03/10 15:04:04 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.204 2010/03/07 10:11:04 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.205 2010/03/10 15:04:04 msaitoh Exp $");
#include "rnd.h"
@@ -1246,7 +1246,7 @@
*/
if ((sc->sc_type == WM_T_82546) || (sc->sc_type == WM_T_82546_3)
|| (sc->sc_type == WM_T_82571) || (sc->sc_type == WM_T_80003)
- || (sc->sc_type == WM_T_82575))
+ || (sc->sc_type == WM_T_82575) || (sc->sc_type == WM_T_82576))
sc->sc_funcid = (CSR_READ(sc, WMREG_STATUS)
>> STATUS_FUNCID_SHIFT) & STATUS_FUNCID_MASK;
else
@@ -1625,7 +1625,7 @@
*/
if ((sc->sc_type == WM_T_82546) || (sc->sc_type == WM_T_82546_3)
|| (sc->sc_type == WM_T_82571) || (sc->sc_type == WM_T_80003)
- || (sc->sc_type == WM_T_82575)) {
+ || (sc->sc_type == WM_T_82575) || (sc->sc_type == WM_T_82576)) {
if (sc->sc_funcid == 1)
enaddr[5] ^= 1;
}
