Messages in this thread | | | Date | Wed, 18 May 2016 11:45:06 -0700 | Subject | Re: [GIT] Networking | From | Linus Torvalds <> |
| |
On Wed, May 18, 2016 at 7:23 AM, Coelho, Luciano <luciano.coelho@intel.com> wrote: > > I can confirm that 4.6 contains the same bug. And reverting the patch > I mentioned does solve the problem... > > The same patch works fine in our internal tree. I'll have to figure > out together with Emmanuel what the problem actually is.
Hmm.
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().
The reason seems to be a conflict with d8fe484470dd, where David missed the fact that "info->driver_data[0]" had become "skb_info->driver_data[0]", and then he removed the skb_info because it was unused.
I do not know if that's the reason for the problem I see. But I will test.
David, do you happen to recall that merge conflict? I think you must have removed that "skb_info" variable declaration and initialization manually (due to the "unused variable" warning, which in turn was due to the incorrect merge of the actual conflict), because I think git would have merged that line into the result.
Linus
| |