diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2007-05-09 17:33:00 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2007-05-09 17:33:00 +0000 |
| commit | f5def245cf4080750dca2a1852d506c2912ba6c1 (patch) | |
| tree | 6f7ddf6ae918f350a3e561e2e637de87a39b4489 /sys/dev | |
| parent | 3bdaf765a82035cbe75d228ae8c3a83dcf0ffe9d (diff) | |
Revert rev 1.116. For some reason this caused the device to do DMA from/to
random addresses in some cases, causing watchdog timeouts.
tested by many; ok deraadt@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/if_em.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c index 3ca8e7db9a9..3951ad46d0c 100644 --- a/sys/dev/pci/if_em.c +++ b/sys/dev/pci/if_em.c @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ -/* $OpenBSD: if_em.c,v 1.167 2007/03/16 00:07:36 reyk Exp $ */ +/* $OpenBSD: if_em.c,v 1.168 2007/05/09 17:32:59 kettenis Exp $ */ /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */ #include <dev/pci/if_em.h> @@ -502,8 +502,7 @@ em_ioctl(struct ifnet *ifp, u_long command, caddr_t data) IOCTL_DEBUGOUT("ioctl rcv'd: SIOCSIFADDR (Set Interface " "Addr)"); ifp->if_flags |= IFF_UP; - if (!(ifp->if_flags & IFF_RUNNING)) - em_init(sc); + em_init(sc); #ifdef INET if (ifa->ifa_addr->sa_family == AF_INET) arp_ifinit(&sc->interface_data, ifa); |