Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1403228

Re: [GIT] Networking

Show all headers | View raw

On Wed, 2016-05-18 at 11:45 -0700, Linus Torvalds wrote:
> 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.

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.

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

Re: [GIT] Networking Linus Torvalds <torvalds@linux-foundation.org> - 2016-05-18 03:10 +0200
  Re: [GIT] Networking Emmanuel Grumbach <egrumbach@gmail.com> - 2016-05-18 05:40 +0200
    Re: [GIT] Networking "Coelho, Luciano" <luciano.coelho@intel.com> - 2016-05-18 13:00 +0200
      Re: [GIT] Networking Reinoud Koornstra <reinoudkoornstra@gmail.com> - 2016-05-18 14:30 +0200
        Re: [GIT] Networking "Coelho, Luciano" <luciano.coelho@intel.com> - 2016-05-18 14:50 +0200
          Re: [GIT] Networking Reinoud Koornstra <reinoudkoornstra@gmail.com> - 2016-05-18 15:00 +0200
            Re: [GIT] Networking "Coelho, Luciano" <luciano.coelho@intel.com> - 2016-05-18 16:30 +0200
              Re: [GIT] Networking Linus Torvalds <torvalds@linux-foundation.org> - 2016-05-18 20:50 +0200
                Re: [GIT] Networking Kalle Valo <kvalo@codeaurora.org> - 2016-05-18 21:00 +0200
                Re: [GIT] Networking Linus Torvalds <torvalds@linux-foundation.org> - 2016-05-18 21:10 +0200
                Re: [GIT] Networking "Coelho, Luciano" <luciano.coelho@intel.com> - 2016-05-18 21:10 +0200
                Re: [GIT] Networking Kalle Valo <kvalo@codeaurora.org> - 2016-05-18 21:20 +0200
                Re: [GIT] Networking Linus Torvalds <torvalds@linux-foundation.org> - 2016-05-18 21:00 +0200
                Re: [GIT] Networking Reinoud Koornstra <reinoudkoornstra@gmail.com> - 2016-05-19 10:30 +0200
                Re: [GIT] Networking Reinoud Koornstra <reinoudkoornstra@gmail.com> - 2016-05-19 11:20 +0200
                Re: [GIT] Networking Sedat Dilek <sedat.dilek@gmail.com> - 2016-05-19 11:50 +0200
                Re: [GIT] Networking "Coelho, Luciano" <luciano.coelho@intel.com> - 2016-05-18 21:00 +0200
                [PATCH] iwlwifi: mvm: fix merge damage in tx.c Luca Coelho <luca@coelho.fi> - 2016-05-18 21:40 +0200
                Re: [GIT] Networking David Miller <davem@davemloft.net> - 2016-05-19 06:10 +0200

csiph-web