From 3b3ec2004ad07e8d74a58d497cd5c78e4aa8a108 Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Fri, 7 Dec 2001 00:57:57 +0000 Subject: MFS (merge from stable): rev 1.9.2.28, fix ordering of IFF_RUNNING mods. The reason we are required to commit to -current first is so that later MFC's do not risk the loss of existing bug fixes. Even if this was not strictly required in -current, it should still be fixed there too. --- sys/dev/dc/if_dc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/dev/dc') diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c index 05d2ff612e0d..7a0c54dc2a70 100644 --- a/sys/dev/dc/if_dc.c +++ b/sys/dev/dc/if_dc.c @@ -3373,6 +3373,8 @@ static void dc_stop(sc) callout_stop(&sc->dc_stat_ch); + ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE); + DC_CLRBIT(sc, DC_NETCFG, (DC_NETCFG_RX_ON|DC_NETCFG_TX_ON)); CSR_WRITE_4(sc, DC_IMR, 0x00000000); CSR_WRITE_4(sc, DC_TXADDR, 0x00000000); @@ -3409,8 +3411,6 @@ static void dc_stop(sc) bzero((char *)&sc->dc_ldata->dc_tx_list, sizeof(sc->dc_ldata->dc_tx_list)); - ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE); - DC_UNLOCK(sc); return; -- cgit v1.3