diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2008-01-29 17:17:04 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2008-01-29 17:17:04 +0000 |
| commit | 4e5c17b9f6f01bf81e466522a2281dba6e5db2f1 (patch) | |
| tree | 019d148de8ac7c8cb692036bee7c9ec200c0fdf3 | |
| parent | c38a48d5152a212247c89e2fb02a9f4e38790490 (diff) | |
| download | upstream-4e5c17b9f6f01bf81e466522a2281dba6e5db2f1.tar.gz upstream-4e5c17b9f6f01bf81e466522a2281dba6e5db2f1.tar.bz2 upstream-4e5c17b9f6f01bf81e466522a2281dba6e5db2f1.zip | |
fix a small race condition in the madwifi queue handling
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10312 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/madwifi/patches/327-queue.patch | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/package/madwifi/patches/327-queue.patch b/package/madwifi/patches/327-queue.patch index 521b31c889..aa26382299 100644 --- a/package/madwifi/patches/327-queue.patch +++ b/package/madwifi/patches/327-queue.patch @@ -1,7 +1,7 @@ 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 +--- madwifi-trunk-r3280.orig/ath/if_ath.c 2008-01-29 17:57:02.738327980 +0100 ++++ madwifi-trunk-r3280/ath/if_ath.c 2008-01-29 17:57:02.770329801 +0100 @@ -8336,8 +8336,6 @@ ath_hal_intrset(sc->sc_ah, sc->sc_imask); local_irq_restore(flags); @@ -29,3 +29,16 @@ Index: madwifi-trunk-r3280/ath/if_ath.c if (sc->sc_softled) ath_led_event(sc, ATH_LED_TX); } +Index: madwifi-trunk-r3280/net80211/ieee80211_input.c +=================================================================== +--- madwifi-trunk-r3280.orig/net80211/ieee80211_input.c 2008-01-29 17:57:29.147832972 +0100 ++++ madwifi-trunk-r3280/net80211/ieee80211_input.c 2008-01-29 17:58:27.315147737 +0100 +@@ -1136,7 +1136,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) |