From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753616AbcEPNiA (ORCPT ); Mon, 16 May 2016 09:38:00 -0400 Received: from mga04.intel.com ([192.55.52.120]:29898 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752704AbcEPNh6 (ORCPT ); Mon, 16 May 2016 09:37:58 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,627,1455004800"; d="scan'208";a="104661080" From: "Coelho, Luciano" To: "sfr@canb.auug.org.au" , "kvalo@codeaurora.org" CC: "linux-wireless@vger.kernel.org" , "davem@davemloft.net" , "netdev@vger.kernel.org" , "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: Re: linux-next: manual merge of the wireless-drivers-next tree with the net-next tree Thread-Topic: linux-next: manual merge of the wireless-drivers-next tree with the net-next tree Thread-Index: AQHRr3RZeJTgS2wINkmzoF2EfdVwHZ+7gKGA Date: Mon, 16 May 2016 13:37:55 +0000 Message-ID: <1463405875.25219.98.camel@intel.com> References: <20160516101606.751f9613@canb.auug.org.au> <871t529mik.fsf@kamboji.qca.qualcomm.com> In-Reply-To: <871t529mik.fsf@kamboji.qca.qualcomm.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.252.31.239] Content-Type: text/plain; charset="utf-8" Content-ID: <77528AFF24B12D49927A78A6AD57B127@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 u4GDc6bL014748 Hi Kalle, On Mon, 2016-05-16 at 16:10 +0300, Kalle Valo wrote: > (Adding Luca and linux-wireless) > > Stephen Rothwell writes: > > > > > Today's linux-next merge of the wireless-drivers-next tree got a > > conflict in: > > > >   drivers/net/wireless/intel/iwlwifi/mvm/tx.c > > > > between commit: > > > >   909b27f70643 ("Merge > > git://git.kernel.org/pub/scm/linux/kernel/git/davem/net") > > > > from the net-next tree and commit: > > > >   a525d0eab17d ("Merge tag 'iwlwifi-for-kalle-2016-05-04' of > > git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi- > > fixes") > > > > from the wireless-drivers-next tree. > > > > I fixed it up (I think that the net-next tree merge lost the > > changes > > to iwl_mvm_set_tx_cmd() associated with commit 5c08b0f5026f > > ("iwlwifi: > > mvm: don't override the rate with the AMSDU len")) and can carry > > the > > fix as necessary. > Hmm, I'm starting to suspect something is wrong. I did a test merge > of > net-next and wireless-drivers-next and got this as a diff after the > merge: > > --- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c > +++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c > @@ -211,7 +211,6 @@ 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); > @@ -295,7 +294,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)skb_info->driver_data[0]); > +               (uintptr_t)info->driver_data[0]); >         tx_cmd->life_time = cpu_to_le32(TX_CMD_LIFE_TIME_INFINITE); >         tx_cmd->sta_id = sta_id; > > But commit 5c08b0f5026f ("iwlwifi: mvm: don't override the rate with > the > AMSDU len") specifically added skb_info variable to that function: > > @@ -105,6 +105,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); > @@ -185,7 +186,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->next_frame_len = 0; >         tx_cmd->life_time = cpu_to_le32(TX_CMD_LIFE_TIME_INFINITE); >         tx_cmd->sta_id = sta_id; > > I wasn't expecting that skb_info variable is removed. Do we now have > merge damage somewhere? Luca, what do you think? As we discussed on IRC, it seems to me that there was a merge damage when Dave merged net.git into net-next.git (as you mostly found out ;). I'm not sure how to solve that, but I'm sure you and Dave can figure something out. :) Please let me know if you need any help with it. -- Cheers, Luca.