Return-path: Received: from mail-vk0-f65.google.com ([209.85.213.65]:33572 "EHLO mail-vk0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753433AbcESJkZ (ORCPT ); Thu, 19 May 2016 05:40:25 -0400 MIME-Version: 1.0 Reply-To: sedat.dilek@gmail.com In-Reply-To: References: <20160517.151113.367799295750703003.davem@davemloft.net> <1463568714.13625.18.camel@intel.com> <1463575273.13625.23.camel@intel.com> <1463581411.29999.1.camel@intel.com> Date: Thu, 19 May 2016 11:40:23 +0200 Message-ID: (sfid-20160519_114100_157443_359F11B2) Subject: Re: [GIT] Networking From: Sedat Dilek To: Reinoud Koornstra Cc: Linus Torvalds , "Coelho, Luciano" , "linux-kernel@vger.kernel.org" , linuxwifi , "Berg, Johannes" , "akpm@linux-foundation.org" , "kvalo@codeaurora.org" , "egrumbach@gmail.com" , "netdev@vger.kernel.org" , "davem@davemloft.net" , "linux-wireless@vger.kernel.org" , "Grumbach, Emmanuel" Content-Type: text/plain; charset=UTF-8 Sender: linux-wireless-owner@vger.kernel.org List-ID: On 5/19/16, Reinoud Koornstra wrote: > On Thu, May 19, 2016 at 2:20 AM, Reinoud Koornstra > wrote: >> On Wed, May 18, 2016 at 12:51 PM, Linus Torvalds >> wrote: >>> On Wed, May 18, 2016 at 11:45 AM, Linus Torvalds >>> wrote: >>>> >>>> From what I can tell, there's a merge bug in commit 909b27f70643, >>>> where David seems to have lost some of the changes to >>>> iwl_mvm_set_tx_cmd(). >>>> >>>> I do not know if that's the reason for the problem I see. But I will >>>> test. >>> >>> Yes. The attached patch that fixes the incorrect merge seems to fix >>> things for me. >>> >>> That should mean that the assumption that this problem existed in v4.6 >>> too was wrong, because the incorrect merge came in later. I think >>> Luciano mis-understood "v4.6+" to mean plain v4.6. >>> >>> Reinoud Koornstra, does this patch fix things for you too? >> >> Indeed, I meant 4.6+, not 4.6. >> The patch you attached doesn't change existing code for me in 4.6+ as >> these two lines are already in there. >> Thanks, >> >> Reinoud. >> > > In the 4.6+ code from today I reverted commit 5c08b0f5026f. > Now iwlwifi works fine for me again. > So it's as the Intel guys suspected. > I'll attached my revert compared to the current 4.6+ development code. > Thanks, > I am not affected by any of these iwlwifi issues. Can you next time add the commit-subject together with the commit-id, like this... commit 5c08b0f5026fcc13efb947c4d1f2ca3558145f68 "iwlwifi: mvm: don't override the rate with the AMSDU len" ...it's easier for followers of this thread. - Sedat - [1] http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=5c08b0f5026fcc13efb947c4d1f2ca3558145f68