From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753751AbcERSuT (ORCPT ); Wed, 18 May 2016 14:50:19 -0400 Received: from mga02.intel.com ([134.134.136.20]:41731 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752009AbcERSuQ (ORCPT ); Wed, 18 May 2016 14:50:16 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,330,1459839600"; d="scan'208";a="957452734" From: "Coelho, Luciano" To: "torvalds@linux-foundation.org" CC: "linux-kernel@vger.kernel.org" , linuxwifi , "Berg, Johannes" , "akpm@linux-foundation.org" , "kvalo@codeaurora.org" , "egrumbach@gmail.com" , "reinoudkoornstra@gmail.com" , "netdev@vger.kernel.org" , "davem@davemloft.net" , "linux-wireless@vger.kernel.org" , "Grumbach, Emmanuel" Subject: Re: [GIT] Networking Thread-Topic: [GIT] Networking Thread-Index: AQHRsLaf8kQ/OuMXFEaLwxa9HQIEjZ++dGMAgAAYrgCAAAXdgIAAAv6AgAAZl4CAAEkWAIAAAWyA Date: Wed, 18 May 2016 18:50:11 +0000 Message-ID: <1463597411.29999.16.camel@intel.com> 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> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.252.8.149] Content-Type: text/plain; charset="utf-8" Content-ID: <6F51AE4DB231374981F7ECC4A7A9DFF8@intel.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by mail.home.local id u4IIoXVT029897 On Wed, 2016-05-18 at 11:45 -0700, Linus Torvalds wrote: > On Wed, May 18, 2016 at 7:23 AM, Coelho, Luciano > 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. Actually I just tested it and indeed it seems to be the merge damage (which we discussed extensively in the linux-wireless mailing list) that causes this problem.  The "4.6 doesn't work either" thing was a false alarm. If the merge damage is fixed this way, the problem is gone: diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c index b5f7c36..ae2ecf6 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c @@ -211,6 +211,7 @@ void iwl_mvm_set_tx_cmd(struct iwl_mvm *mvm, struct sk_buff *skb,                         struct iwl_tx_cmd *tx_cmd,                         struct ieee80211_tx_info *info, u8 sta_id)  { +       struct ieee80211_tx_info *skb_info = IEEE80211_SKB_CB(skb);         struct ieee80211_hdr *hdr = (void *)skb->data;         __le16 fc = hdr->frame_control;         u32 tx_flags = le32_to_cpu(tx_cmd->tx_flags); @@ -294,7 +295,7 @@ void iwl_mvm_set_tx_cmd(struct iwl_mvm *mvm, struct sk_buff *skb,         tx_cmd->tx_flags = cpu_to_le32(tx_flags);         /* Total # bytes to be transmitted */         tx_cmd->len = cpu_to_le16((u16)skb->len + -               (uintptr_t)info->driver_data[0]); +               (uintptr_t)skb_info->driver_data[0]);         tx_cmd->life_time = cpu_to_le32(TX_CMD_LIFE_TIME_INFINITE);         tx_cmd->sta_id = sta_id; Kalle, David, what is the status with the fix that is on the way via your trees? -- Cheers, Luca.