diff options
| author | peter <peter@FreeBSD.org> | 2001-12-07 00:57:57 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2001-12-07 00:57:57 +0000 |
| commit | 4cfbfee7bf71c68b2b802bf53a064148f9a12888 (patch) | |
| tree | 96b440a95f5a219e4520367e03e14e2693dc494a /sys/pci | |
| parent | dd9dc87190eb5fe52ef417bced15efe236be7393 (diff) | |
| download | FreeBSD-src-4cfbfee7bf71c68b2b802bf53a064148f9a12888.zip FreeBSD-src-4cfbfee7bf71c68b2b802bf53a064148f9a12888.tar.gz | |
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.
Diffstat (limited to 'sys/pci')
| -rw-r--r-- | sys/pci/if_dc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/pci/if_dc.c b/sys/pci/if_dc.c index 05d2ff6..7a0c54d 100644 --- a/sys/pci/if_dc.c +++ b/sys/pci/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; |
