On Fri, 2010-09-24 at 15:17 -0400, John W. Linville wrote: > On Thu, Sep 23, 2010 at 02:04:24PM -0700, Wey-Yi Guy wrote: > > Different devices has different timing requirement, change the timeout > > value for 5000 series devices to avoid un-necessary firmware reload which > > can cause device become unstable.For 5000 series of devices, use long monitor timer to check > > stuck tx queues. > > > > It is being reported firmware got reload more > > often than necessary, so extend the timer to avoid un-necessary reload. > > > > This fixes: > > http://article.gmane.org/gmane.linux.kernel.wireless.general/53552 > > > > Cc: stable@xxxxxxxxxx [2.6.35] > So then I try applying it directly... > > [linville-8530p.local]:> git am -s fixes.mbox > Applying: use long timer for un-necessary reload the firmware > error: patch failed: drivers/net/wireless/iwlwifi/iwl-1000.c:257 Actually, I believe you weren't meant to apply this, this looks like a backport of commit 78e1e688a404573a6788abbddfe2f4631d833bca Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx> Date: Fri Jul 23 13:19:39 2010 -0700 iwlwifi: long monitor timer to stable-2.6.35, since the original commit had no cc: stable tag. johannes -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html