diff for duplicates of <20100409153807.GA3014@tuxdriver.com> diff --git a/a/1.txt b/N1/1.txt index d760763..9b66b0b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -59,13 +59,3 @@ index 83c52a6..8972166 100644 (iwl_queue_space(&txq->q) > txq->q.low_mark)) iwl_wake_queue(priv, txq_id); } -- -- iwl_txq_check_empty(priv, sta_id, tid, txq_id); -+ if (qc && likely(sta_id != IWL_INVALID_STATION)) -+ iwl_txq_check_empty(priv, sta_id, tid, txq_id); - - if (iwl_check_bits(status, TX_ABORT_REQUIRED_MSK)) - IWL_ERR(priv, "TODO: Implement Tx ABORT REQUIRED!!!\n"); --- -John W. Linville Someday the world will need a hero, and you -linville@tuxdriver.com might be all we have. Be ready. diff --git a/a/content_digest b/N1/content_digest index 972a2dc..6d7ef05 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,23 +3,23 @@ "ref\01270759800.19330.19.camel@wwguy-ubuntu\0" "ref\020100408200218.GC2999@tuxdriver.com\0" "ref\01270762107.20845.3.camel@wwguy-ubuntu\0" - "From\0John W. Linville <linville@tuxdriver.com>\0" + "From\0John W. Linville <linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>\0" "Subject\0pull request: wireless-2.6 2010-04-09\0" "Date\0Fri, 9 Apr 2010 11:38:07 -0400\0" - "To\0davem@davemloft.net\0" - "Cc\0Jeff Chua <jeff.chua.linux@gmail.com>" + "To\0davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org\0" + "Cc\0Jeff Chua <jeff.chua.linux-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>" Zhao - Shanyu <shanyu.zhao@intel.com> + Shanyu <shanyu.zhao-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> Chatre - Reinette <reinette.chatre@intel.com> - stable@kernel.org <stable@kernel.org> - Linux Kernel <linux-kernel@vger.kernel.org> - Linus Torvalds <torvalds@linux-foundation.org> - Al Viro <viro@zeniv.linux.org.uk> + Reinette <reinette.chatre-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> + stable-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org <stable-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> + Linux Kernel <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> + Linus Torvalds <torvalds-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org> + Al Viro <viro-RmSDqhL/yNMiFSDQTTA3OLVCufUGDwFn@public.gmane.org> Guy - Wey-Yi <wey-yi.w.guy@intel.com> - linux-wireless@vger.kernel.org - " netdev@vger.kernel.org\0" + Wey-Yi <wey-yi.w.guy-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> + linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "Dave,\n" @@ -82,16 +82,6 @@ " \t\tif (priv->mac80211_registered &&\n" " \t\t (iwl_queue_space(&txq->q) > txq->q.low_mark))\n" " \t\t\tiwl_wake_queue(priv, txq_id);\n" - " \t}\n" - "-\n" - "-\tiwl_txq_check_empty(priv, sta_id, tid, txq_id);\n" - "+\tif (qc && likely(sta_id != IWL_INVALID_STATION))\n" - "+\t\tiwl_txq_check_empty(priv, sta_id, tid, txq_id);\n" - " \n" - " \tif (iwl_check_bits(status, TX_ABORT_REQUIRED_MSK))\n" - " \t\tIWL_ERR(priv, \"TODO: Implement Tx ABORT REQUIRED!!!\\n\");\n" - "-- \n" - "John W. Linville\t\tSomeday the world will need a hero, and you\n" - "linville@tuxdriver.com\t\t\tmight be all we have. Be ready." + " \t}" -98e8ff9aa5dddf28669d51f4bd0cf9872ca13186c5af808da5b2e88d453b2f50 +47917265176be4321e752f90ff547812e9462f0a2c5138a2c734899727534199
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.