From dd376135b385eab35f5343d322610bbb6cf1d8d3 Mon Sep 17 00:00:00 2001 From: Martin Pieuchot Date: Wed, 25 Nov 2015 11:12:54 +0000 Subject: Small fixes related to the IFF_OACTIVE removal. --- sys/arch/armv7/omap/if_cpsw.c | 4 ++-- sys/dev/ic/i82596.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sys') diff --git a/sys/arch/armv7/omap/if_cpsw.c b/sys/arch/armv7/omap/if_cpsw.c index 124b06a1143..ad70fba0eb3 100644 --- a/sys/arch/armv7/omap/if_cpsw.c +++ b/sys/arch/armv7/omap/if_cpsw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cpsw.c,v 1.30 2015/11/25 03:09:57 dlg Exp $ */ +/* $OpenBSD: if_cpsw.c,v 1.31 2015/11/25 11:12:53 mpi Exp $ */ /* $NetBSD: if_cpsw.c,v 1.3 2013/04/17 14:36:34 bouyer Exp $ */ /* @@ -935,7 +935,7 @@ cpsw_stop(struct ifnet *ifp) rdp->tx_mb[i] = NULL; } - ifp->if_flags &= ~IFF_RUNNING); + ifp->if_flags &= ~IFF_RUNNING; ifp->if_timer = 0; ifq_clr_oactive(&ifp->if_snd); diff --git a/sys/dev/ic/i82596.c b/sys/dev/ic/i82596.c index c47ae409f79..82202463b3a 100644 --- a/sys/dev/ic/i82596.c +++ b/sys/dev/ic/i82596.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i82596.c,v 1.48 2015/11/25 03:09:58 dlg Exp $ */ +/* $OpenBSD: i82596.c,v 1.49 2015/11/25 11:12:53 mpi Exp $ */ /* $NetBSD: i82586.c,v 1.18 1998/08/15 04:42:42 mycroft Exp $ */ /*- @@ -1353,7 +1353,7 @@ i82596_reset(sc, hard) /* Clear OACTIVE in case we're called from watchdog (frozen xmit). */ sc->sc_arpcom.ac_if.if_timer = 0; - ifq_clr_oactive(sc->sc_arpcom.ac_if.if_snd); + ifq_clr_oactive(&sc->sc_arpcom.ac_if.if_snd); /* * Stop i82596 dead in its tracks. -- cgit v1.2.3