summaryrefslogtreecommitdiffstats
path: root/sys/pci
diff options
context:
space:
mode:
authorwpaul <wpaul@FreeBSD.org>1999-07-25 05:16:05 +0000
committerwpaul <wpaul@FreeBSD.org>1999-07-25 05:16:05 +0000
commit13adfcc8d63dbe3e5853e7af60ec1795580fde7f (patch)
treeffd4cce58d4bca3b1f85152ea557cc5570bbd7ec /sys/pci
parent97307ab479f01e32a804d2373409fa9d33e57b4a (diff)
downloadFreeBSD-src-13adfcc8d63dbe3e5853e7af60ec1795580fde7f.zip
FreeBSD-src-13adfcc8d63dbe3e5853e7af60ec1795580fde7f.tar.gz
Remember to clear the IFF_RUNNING and IFF_OACTIVE flags in sf_stop() and
sk_stop().
Diffstat (limited to 'sys/pci')
-rw-r--r--sys/pci/if_sf.c9
-rw-r--r--sys/pci/if_sk.c8
2 files changed, 13 insertions, 4 deletions
diff --git a/sys/pci/if_sf.c b/sys/pci/if_sf.c
index 685d0f9..e4de7e6 100644
--- a/sys/pci/if_sf.c
+++ b/sys/pci/if_sf.c
@@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: if_sf.c,v 1.11 1999/07/24 21:13:38 wpaul Exp $
+ * $Id: if_sf.c,v 1.12 1999/07/25 05:10:18 wpaul Exp $
*/
/*
@@ -119,7 +119,7 @@
#ifndef lint
static const char rcsid[] =
- "$Id: if_sf.c,v 1.11 1999/07/24 21:13:38 wpaul Exp $";
+ "$Id: if_sf.c,v 1.12 1999/07/25 05:10:18 wpaul Exp $";
#endif
static struct sf_type sf_devs[] = {
@@ -1720,6 +1720,9 @@ static void sf_stop(sc)
struct sf_softc *sc;
{
int i;
+ struct ifnet *ifp;
+
+ ifp = &sc->arpcom.ac_if;
untimeout(sf_stats_update, sc, sc->sf_stat_ch);
@@ -1748,6 +1751,8 @@ static void sf_stop(sc)
}
}
+ ifp->if_flags &= ~(IFF_RUNNING|IFF_OACTIVE);
+
return;
}
diff --git a/sys/pci/if_sk.c b/sys/pci/if_sk.c
index 81db591..aee546f 100644
--- a/sys/pci/if_sk.c
+++ b/sys/pci/if_sk.c
@@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: if_sk.c,v 1.7 1999/07/23 02:06:55 wpaul Exp $
+ * $Id: if_sk.c,v 1.51 1999/07/14 21:48:19 wpaul Exp $
*/
/*
@@ -102,7 +102,7 @@
#ifndef lint
static const char rcsid[] =
- "$Id: if_sk.c,v 1.7 1999/07/23 02:06:55 wpaul Exp $";
+ "$Id: if_sk.c,v 1.51 1999/07/14 21:48:19 wpaul Exp $";
#endif
static struct sk_type sk_devs[] = {
@@ -1928,8 +1928,10 @@ static void sk_stop(sc_if)
{
int i;
struct sk_softc *sc;
+ struct ifnet *ifp;
sc = sc_if->sk_softc;
+ ifp = &sc_if->arpcom.ac_if;
/* Turn off various components of this interface. */
SK_IF_WRITE_2(sc_if, 0, SK_TXF1_MACCTL, SK_TXMACCTL_XMAC_RESET);
@@ -1966,5 +1968,7 @@ static void sk_stop(sc_if)
}
}
+ ifp->if_flags &= ~(IFF_RUNNING|IFF_OACTIVE);
+
return;
}
OpenPOWER on IntegriCloud