[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAAA5faFWPCrk0C3sjT==VMVCq1jcR8_HANV=RRE-Ummv4_psHA@mail.gmail.com>
Date: Thu, 19 May 2016 03:14:55 -0600
From: Reinoud Koornstra <reinoudkoornstra@...il.com>
To: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: "Coelho, Luciano" <luciano.coelho@...el.com>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
linuxwifi <linuxwifi@...el.com>,
"Berg, Johannes" <johannes.berg@...el.com>,
"akpm@...ux-foundation.org" <akpm@...ux-foundation.org>,
"kvalo@...eaurora.org" <kvalo@...eaurora.org>,
"egrumbach@...il.com" <egrumbach@...il.com>,
"netdev@...r.kernel.org" <netdev@...r.kernel.org>,
"davem@...emloft.net" <davem@...emloft.net>,
"linux-wireless@...r.kernel.org" <linux-wireless@...r.kernel.org>,
"Grumbach, Emmanuel" <emmanuel.grumbach@...el.com>
Subject: Re: [GIT] Networking
On Thu, May 19, 2016 at 2:20 AM, Reinoud Koornstra
<reinoudkoornstra@...il.com> wrote:
> On Wed, May 18, 2016 at 12:51 PM, Linus Torvalds
> <torvalds@...ux-foundation.org> wrote:
>> On Wed, May 18, 2016 at 11:45 AM, Linus Torvalds
>> <torvalds@...ux-foundation.org> 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,
Reinoud.
>>
>> Linus
View attachment "iwlwifi.diff" of type "text/plain" (10107 bytes)
Powered by blists - more mailing lists