[src/trunk]: src/sys/dev/pci Commit patch from t-hash in PR kern/48309

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

details:   https://anonhg.NetBSD.org/src/rev/9bce7e7f9388
branches:  trunk
changeset: 345569:9bce7e7f9388
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Wed Jun 01 03:37:35 2016 +0000

description:
Commit patch from t-hash in PR kern/48309

diffstat:

 sys/dev/pci/if_msk.c |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r dcd3164c0e63 -r 9bce7e7f9388 sys/dev/pci/if_msk.c
--- a/sys/dev/pci/if_msk.c      Wed Jun 01 02:50:02 2016 +0000
+++ b/sys/dev/pci/if_msk.c      Wed Jun 01 03:37:35 2016 +0000
@@ -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 @@
        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) */