diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2013-03-07 19:30:53 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2013-03-07 19:30:53 +0000 |
| commit | df1dcad0f10f44fc8129846246dc20bf4db6fae8 (patch) | |
| tree | 9188d02e8191ab2244d98d39d0c8a385c0672e42 /sys | |
| parent | 10774fbe8e5e2978d40fade9e10e76706bf57af3 (diff) | |
Correct the location of a DELAY() that was mismerged from FreeBSD in rev 1.319
within the ifmedia update function. It is supposed to come after the BGE_MAC_MODE
register write.
ok sthen@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/if_bge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c index 08a40e12d81..4b6250612a8 100644 --- a/sys/dev/pci/if_bge.c +++ b/sys/dev/pci/if_bge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bge.c,v 1.320 2013/03/04 01:33:18 dlg Exp $ */ +/* $OpenBSD: if_bge.c,v 1.321 2013/03/07 19:30:52 brad Exp $ */ /* * Copyright (c) 2001 Wind River Systems @@ -4021,7 +4021,6 @@ bge_ifmedia_upd(struct ifnet *ifp) CSR_WRITE_4(sc, BGE_SGDIG_CFG, sgdig); } } - DELAY(40); break; case IFM_1000_SX: if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) { @@ -4031,6 +4030,7 @@ bge_ifmedia_upd(struct ifnet *ifp) BGE_SETBIT(sc, BGE_MAC_MODE, BGE_MACMODE_HALF_DUPLEX); } + DELAY(40); break; default: return (EINVAL); |