1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-14 10:09:48 +00:00

MFS (merge from stable): rev 1.13.4.13, 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.
This commit is contained in:
Peter Wemm 2001-12-07 00:58:37 +00:00
parent 3b3ec2004a
commit 341538b884
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=87472

View File

@ -1908,6 +1908,9 @@ static void sis_stop(sc)
ifp->if_timer = 0;
untimeout(sis_tick, sc, sc->sis_stat_ch);
ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);
CSR_WRITE_4(sc, SIS_IER, 0);
CSR_WRITE_4(sc, SIS_IMR, 0);
SIS_SETBIT(sc, SIS_CSR, SIS_CSR_TX_DISABLE|SIS_CSR_RX_DISABLE);
@ -1950,8 +1953,6 @@ static void sis_stop(sc)
bzero(sc->sis_ldata.sis_tx_list,
sizeof(sc->sis_ldata.sis_tx_list));
ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);
SIS_UNLOCK(sc);
return;