[ar7] revert part of r16112, the setup.c part needs more testing

[openwrt.git] / package / madwifi / patches / 327-queue.patch

diff --git a/package/madwifi/patches/327-queue.patch b/package/madwifi/patches/327-queue.patch
index 521b31c..228aae3 100644 (file)
--- a/package/madwifi/patches/327-queue.patch
+++ b/package/madwifi/patches/327-queue.patch
@@ -1,8 +1,6 @@
-Index: madwifi-trunk-r3280/ath/if_ath.c
-===================================================================
---- madwifi-trunk-r3280.orig/ath/if_ath.c      2008-01-28 20:01:09.051041030 +0100
-+++ madwifi-trunk-r3280/ath/if_ath.c   2008-01-28 20:01:55.057662800 +0100
-@@ -8336,8 +8336,6 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -8438,8 +8438,6 @@ process_tx_again:
        ath_hal_intrset(sc->sc_ah, sc->sc_imask);
        local_irq_restore(flags);
  
@@ -11,7 +9,7 @@ Index: madwifi-trunk-r3280/ath/if_ath.c
        if (sc->sc_softled)
                ath_led_event(sc, ATH_LED_TX);
  }
-@@ -8384,8 +8382,6 @@
+@@ -8486,8 +8484,6 @@ process_tx_again:
        ath_hal_intrset(sc->sc_ah, sc->sc_imask);
        local_irq_restore(flags);
  
@@ -20,7 +18,7 @@ Index: madwifi-trunk-r3280/ath/if_ath.c
        if (sc->sc_softled)
                ath_led_event(sc, ATH_LED_TX);
  }
-@@ -8418,8 +8414,6 @@
+@@ -8520,8 +8516,6 @@ process_tx_again:
        ath_hal_intrset(sc->sc_ah, sc->sc_imask);
        local_irq_restore(flags);
  
@@ -29,3 +27,14 @@ Index: madwifi-trunk-r3280/ath/if_ath.c
        if (sc->sc_softled)
                ath_led_event(sc, ATH_LED_TX);
  }
+--- a/net80211/ieee80211_input.c
++++ b/net80211/ieee80211_input.c
+@@ -1132,7 +1132,7 @@ ieee80211_deliver_data(struct ieee80211_
+           (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)