Module Name: src
Committed By: skrll
Date: Sun Sep 29 07:25:53 UTC 2013
Modified Files:
src/sys/dev/usb: if_smsc.c
Log Message:
PR/48251: usmsc cannot change link address
Use CLLADDR appropriately.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/usb/if_smsc.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/usb/if_smsc.c
diff -u src/sys/dev/usb/if_smsc.c:1.10 src/sys/dev/usb/if_smsc.c:1.11
--- src/sys/dev/usb/if_smsc.c:1.10 Sat Mar 30 14:30:24 2013
+++ src/sys/dev/usb/if_smsc.c Sun Sep 29 07:25:53 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_smsc.c,v 1.10 2013/03/30 14:30:24 christos Exp $ */
+/* $NetBSD: if_smsc.c,v 1.11 2013/09/29 07:25:53 skrll Exp $ */
/* $OpenBSD: if_smsc.c,v 1.4 2012/09/27 12:38:11 jsg Exp $ */
/* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
@@ -778,7 +778,9 @@ smsc_chip_init(struct smsc_softc *sc)
usbd_delay_ms(sc->sc_udev, 40);
/* Set the mac address */
- if ((err = smsc_setmacaddress(sc, sc->sc_enaddr)) != 0) {
+ struct ifnet *ifp = &sc->sc_ec.ec_if;
+ const char *eaddr = CLLADDR(ifp->if_sadl);
+ if ((err = smsc_setmacaddress(sc, eaddr)) != 0) {
smsc_warn_printf(sc, "failed to set the MAC address\n");
goto init_failed;
}
