diff options
| author | glebius <glebius@FreeBSD.org> | 2006-02-22 14:11:16 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2006-02-22 14:11:16 +0000 |
| commit | c5df202f3b8ef8af8173f7e77ebf8c99093cd3e9 (patch) | |
| tree | 4d87d7ac82de81fb7ccee6ef64c558b6c1a67093 | |
| parent | a1b7ff0a8318c4000ef725d92bc3f1ca8e1c74c8 (diff) | |
| download | FreeBSD-src-c5df202f3b8ef8af8173f7e77ebf8c99093cd3e9.zip FreeBSD-src-c5df202f3b8ef8af8173f7e77ebf8c99093cd3e9.tar.gz | |
Back out 1.112,1.113. I don't have enough resources to fix breakages
introduced by this change.
| -rw-r--r-- | sys/dev/em/if_em.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sys/dev/em/if_em.c b/sys/dev/em/if_em.c index 7d3c539..c189eb2 100644 --- a/sys/dev/em/if_em.c +++ b/sys/dev/em/if_em.c @@ -954,7 +954,13 @@ em_init_locked(struct em_softc *sc) /* Get the latest mac address, User can use a LAA */ bcopy(IF_LLADDR(sc->ifp), sc->hw.mac_addr, ETHER_ADDR_LEN); - em_init_rx_addrs(&sc->hw); + + /* Initialize the hardware */ + if (em_hardware_init(sc)) { + device_printf(dev, "Unable to initialize the hardware\n"); + return; + } + em_update_link_status(sc); if (ifp->if_capenable & IFCAP_VLAN_HWTAGGING) em_enable_vlans(sc); |
