svn commit: r307577 - head/sys/dev/rtwn/usb

Andriy Voskoboinyk avos at FreeBSD.org
Tue Oct 18 21:17:32 UTC 2016


Author: avos
Date: Tue Oct 18 21:17:31 2016
New Revision: 307577
URL: https://svnweb.freebsd.org/changeset/base/307577

Log:
  rtwn(4): fix build with 'options IEEE80211_SUPPORT_SUPERG'

Modified:
  head/sys/dev/rtwn/usb/rtwn_usb_rx.c
  head/sys/dev/rtwn/usb/rtwn_usb_tx.c

Modified: head/sys/dev/rtwn/usb/rtwn_usb_rx.c
==============================================================================
--- head/sys/dev/rtwn/usb/rtwn_usb_rx.c	Tue Oct 18 20:17:57 2016	(r307576)
+++ head/sys/dev/rtwn/usb/rtwn_usb_rx.c	Tue Oct 18 21:17:31 2016	(r307577)
@@ -216,7 +216,7 @@ rtwn_report_intr(struct rtwn_usb_softc *
 		 * NB: this will executed only when 'report' bit is set.
 		 */
 		if (sc->sc_tx_n_active > 0 && --sc->sc_tx_n_active <= 1)
-			rtwn_cmd_sleepable(uc, NULL, 0, rtwn_ff_flush_all);
+			rtwn_cmd_sleepable(sc, NULL, 0, rtwn_ff_flush_all);
 #endif
 		break;
 	case RTWN_RX_OTHER:
@@ -327,7 +327,7 @@ finish:
 	 */
 #ifdef	IEEE80211_SUPPORT_SUPERG
 	if (!(sc->sc_flags & RTWN_FW_LOADED))
-		rtwn_cmd_sleepable(uc, NULL, 0, rtwn_ff_flush_all);
+		rtwn_cmd_sleepable(sc, NULL, 0, rtwn_ff_flush_all);
 #endif
 
 	/* Kick-start more transmit in case we stalled */

Modified: head/sys/dev/rtwn/usb/rtwn_usb_tx.c
==============================================================================
--- head/sys/dev/rtwn/usb/rtwn_usb_tx.c	Tue Oct 18 20:17:57 2016	(r307576)
+++ head/sys/dev/rtwn/usb/rtwn_usb_tx.c	Tue Oct 18 21:17:31 2016	(r307577)
@@ -207,7 +207,7 @@ finish:
 		 * XXX TODO: just make this a callout timer schedule so we can
 		 * flush the FF staging queue if we're approaching idle.
 		 */
-		rtwn_cmd_sleepable(uc, NULL, 0, rtwn_ff_flush_all);
+		rtwn_cmd_sleepable(sc, NULL, 0, rtwn_ff_flush_all);
 	}
 #endif
 	/* Kick-start more transmit */


More information about the svn-src-head mailing list