d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFS (merge from stable): rev 1.9.2.28, fix ordering of IFF_RUNNING mods.

Browse Source 
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:57:57 +00:00
parent 47c8f6faec
commit 3b3ec2004a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/dc/if_dc.c
View File

@ -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;

4
sys/pci/if_dc.c
View File

@ -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;