Module Name: src
Committed By: pgoyette
Date: Wed Jun 1 03:37:35 UTC 2016
Modified Files:
src/sys/dev/pci: if_msk.c
Log Message:
Commit patch from t-hash in PR kern/48309
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/pci/if_msk.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_msk.c
diff -u src/sys/dev/pci/if_msk.c:1.49 src/sys/dev/pci/if_msk.c:1.50
--- src/sys/dev/pci/if_msk.c:1.49 Tue Feb 9 08:32:11 2016
+++ src/sys/dev/pci/if_msk.c Wed Jun 1 03:37:35 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_msk.c,v 1.49 2016/02/09 08:32:11 ozaki-r Exp $ */
+/* $NetBSD: if_msk.c,v 1.50 2016/06/01 03:37:35 pgoyette Exp $ */
/* $OpenBSD: if_msk.c,v 1.42 2007/01/17 02:43:02 krw Exp $ */
/*
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.49 2016/02/09 08:32:11 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.50 2016/06/01 03:37:35 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2038,6 +2038,11 @@ msk_init_yukon(struct sk_if_softc *sc_if
SK_YU_WRITE_2(sc_if, YUKON_SMR, reg);
DPRINTFN(6, ("msk_init_yukon: 10\n"));
+ struct ifnet *ifp = &sc_if->sk_ethercom.ec_if;
+ /* msk_attach calls me before ether_ifattach so check null */
+ if (ifp != NULL && ifp->if_sadl != NULL)
+ memcpy(sc_if->sk_enaddr, CLLADDR(ifp->if_sadl),
+ sizeof(sc_if->sk_enaddr));
/* Setup Yukon's address */
for (i = 0; i < 3; i++) {
/* Write Source Address 1 (unicast filter) */
