CVS commit: [netbsd-8] src/sys/dev/pci

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Wed Jun 21 21:29:58 UTC 2023

Modified Files:
        src/sys/dev/pci [netbsd-8]: if_wm.c

Log Message:
Apply patch, requested by riastradh in ticket #1842:

        sys/dev/pci/if_wm.c                     (apply patch)

Fix a bug introduced in ticket #1795.


To generate a diff of this commit:
cvs rdiff -u -r1.508.4.48 -r1.508.4.49 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.508.4.48 src/sys/dev/pci/if_wm.c:1.508.4.49
--- src/sys/dev/pci/if_wm.c:1.508.4.48	Mon Jan 23 14:01:25 2023
+++ src/sys/dev/pci/if_wm.c	Wed Jun 21 21:29:57 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wm.c,v 1.508.4.48 2023/01/23 14:01:25 martin Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.508.4.49 2023/06/21 21:29:57 martin Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.48 2023/01/23 14:01:25 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.49 2023/06/21 21:29:57 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -9809,7 +9809,7 @@ wm_linkintr_gmii(struct wm_softc *sc, ui
 		if (wm_phy_need_linkdown_discard(sc)) {
 			DPRINTF(sc, WM_DEBUG_LINK,
 			    ("%s: linkintr: Clear linkdown discard flag\n",
-				device_xname(dev)));
+				device_xname(sc->sc_dev)));
 			wm_clear_linkdown_discard(sc);
 		}
 	} else {
@@ -9818,7 +9818,7 @@ wm_linkintr_gmii(struct wm_softc *sc, ui
 		if (wm_phy_need_linkdown_discard(sc)) {
 			DPRINTF(sc, WM_DEBUG_LINK,
 			    ("%s: linkintr: Set linkdown discard flag\n",
-				device_xname(dev)));
+				device_xname(sc->sc_dev)));
 			wm_set_linkdown_discard(sc);
 		}
 	}