svn commit: r198652 - in stable/8/sys: . amd64/include/xen
cddl/contrib/opensolaris contrib/dev/acpica contrib/pf
dev/usb/net dev/xen/xenpci
Andrew Thompson
thompsa at FreeBSD.org
Thu Oct 29 23:21:52 UTC 2009
Author: thompsa
Date: Thu Oct 29 23:21:52 2009
New Revision: 198652
URL: http://svn.freebsd.org/changeset/base/198652
Log:
MFC r197567
Allow setting of MAC address for AXE based ethernet adapters.
Modified:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/usb/net/if_axe.c
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/dev/usb/net/if_axe.c
==============================================================================
--- stable/8/sys/dev/usb/net/if_axe.c Thu Oct 29 23:21:20 2009 (r198651)
+++ stable/8/sys/dev/usb/net/if_axe.c Thu Oct 29 23:21:52 2009 (r198652)
@@ -982,10 +982,11 @@ axe_init(struct usb_ether *ue)
/* Cancel pending I/O */
axe_stop(ue);
-#ifdef notdef
- /* Set MAC address */
- axe_mac(sc, IF_LLADDR(ifp), 1);
-#endif
+ /* Set MAC address. */
+ if (sc->sc_flags & (AXE_FLAG_178 | AXE_FLAG_772))
+ axe_cmd(sc, AXE_178_CMD_WRITE_NODEID, 0, 0, IF_LLADDR(ifp));
+ else
+ axe_cmd(sc, AXE_172_CMD_WRITE_NODEID, 0, 0, IF_LLADDR(ifp));
/* Set transmitter IPG values */
if (sc->sc_flags & (AXE_FLAG_178 | AXE_FLAG_772)) {
More information about the svn-src-all
mailing list