--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -8448,8 +8448,6 @@
 	ath_hal_intrset(sc->sc_ah, sc->sc_imask);
 	local_irq_restore(flags);
 
-	netif_wake_queue(dev);
-
 	if (sc->sc_softled)
 		ath_led_event(sc, ATH_LED_TX);
 }
@@ -8505,8 +8503,6 @@
 	ath_hal_intrset(sc->sc_ah, sc->sc_imask);
 	local_irq_restore(flags);
 
-	netif_wake_queue(dev);
-
 	if (sc->sc_softled)
 		ath_led_event(sc, ATH_LED_TX);
 }
@@ -8537,7 +8533,9 @@
 				STAILQ_FIRST(&sc->sc_cabq->axq_q) ? "not setup" : "empty");
 		}
 	}
-	netif_wake_queue(dev);
+
+	if (ath_get_buffers_available(sc) > ATH_TXBUF_MGT_RESERVED)
+		netif_wake_queue(dev);
 
 	if (sc->sc_softled)
 		ath_led_event(sc, ATH_LED_TX);
--- a/net80211/ieee80211_input.c
+++ b/net80211/ieee80211_input.c
@@ -1116,7 +1116,7 @@
 	    (vap->iv_flags & IEEE80211_F_NOBRIDGE) == 0) {
 		struct sk_buff *skb1 = NULL;
 
-		if (ETHER_IS_MULTICAST(eh->ether_dhost)) {
+		if (ETHER_IS_MULTICAST(eh->ether_dhost) && !netif_queue_stopped(dev)) {
 			/* Create a SKB for the BSS to send out. */
 			skb1 = skb_copy(skb, GFP_ATOMIC);
 			if (skb1)