Messages in this thread Patch in this message | | | Subject | Re: b43 locks the machine when resuming after suspend to disk | From | Johannes Berg <> | Date | Thu, 03 Jul 2008 00:37:36 +0200 |
| |
On Wed, 2008-07-02 at 17:32 -0500, Larry Finger wrote: > Johannes Berg wrote: > >>> I think you need the appended patch, but it only applies to linux-next. > >> A different version has been merged into what will become 2.6.26. I'll > >> see what we can do about stable. > > > > http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=ef3a62d272f033989e83eb1f26505f93f93e3e69;hp=6d1a3fb567a728d31474636e167c324702a0c38b > > > > Anybody have a stable tree around to see if that applies? I think it > > should. > > It didn't, but this version will. It has been compile tested only.
Ah, the TXRX result thing, thanks a bunch. Adding stable to CC, can you pick this up?
Subject: mac80211: detect driver tx bugs
When a driver rejects a frame in it's ->tx() callback, it must also stop queues, otherwise mac80211 can go into a loop here. Detect this situation and abort the loop after five retries, warning about the driver bug.
Thanks to Larry Finger <Larry.Finger@lwfinger.net> for doing the -stable port.
--- linux-2.6.orig/net/mac80211/tx.c +++ linux-2.6/net/mac80211/tx.c @@ -1090,7 +1090,7 @@ static int ieee80211_tx(struct net_devic ieee80211_tx_handler *handler; struct ieee80211_txrx_data tx; ieee80211_txrx_result res = TXRX_DROP, res_prepare; - int ret, i; + int ret, i, retries = 0; WARN_ON(__ieee80211_queue_pending(local, control->queue)); @@ -1181,6 +1181,13 @@ retry: if (!__ieee80211_queue_stopped(local, control->queue)) { clear_bit(IEEE80211_LINK_STATE_PENDING, &local->state[control->queue]); + retries++; + /* + * Driver bug, it's rejecting packets but + * not stopping queues. + */ + if (WARN_ON_ONCE(retries > 5)) + goto drop; goto retry; } memcpy(&store->control, control,
| |