From patchwork Wed May 18 18:51:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Torvalds X-Patchwork-Id: 9121841 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 867929F37F for ; Wed, 18 May 2016 18:51:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E3E0820357 for ; Wed, 18 May 2016 18:51:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 35EDB2034A for ; Wed, 18 May 2016 18:51:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753893AbcERSva (ORCPT ); Wed, 18 May 2016 14:51:30 -0400 Received: from mail-io0-f196.google.com ([209.85.223.196]:35221 "EHLO mail-io0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752561AbcERSv0 (ORCPT ); Wed, 18 May 2016 14:51:26 -0400 Received: by mail-io0-f196.google.com with SMTP id i75so11117601ioa.2; Wed, 18 May 2016 11:51:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc; bh=a7grb7GykBhP/q1StK14pz+kpVo/kJCEt4hIFM21ftk=; b=Uyv0t74+gPvNTemgLO8VwhjY04+tagsLNDHKGkYGhSI/jtRqs9XyDAjldHuQbQJb9A e5Ub37azZ4CVOCNudCLNIxr7+ysn9G4AJhhPjiIO54MbcPY/fcdRHEc/nZJech7FzvAw WZpxf0foA8dMChlI5AEpB8ef6Tamo9c3OEoCO2TNYRtezGECLeOACUO/5zM5AL231ZIg faspPRzrivAVsV56enNQVxI+OLCwyjuyIlbc9W7jpPXOEo1QWIgAKe/9tE/8JOqUNob9 JbG0Wxxcq+fEzBh4/fw16h1i9Std0In+OSXTK6PGRjDxYjEryB/pmUYnnTCbqZLpjYTy NXVw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=google; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc; bh=a7grb7GykBhP/q1StK14pz+kpVo/kJCEt4hIFM21ftk=; b=IP3GWZKgmUGsB/E6p++vEkgAxwTBXmNDZHRPyZKpvqIfBoGiux+noy/OaTb5oxWqjq XDIFICMqL8iw4cBcAs8UZFmq4XRruNSmIp0X6KOomxYqCiRp8AtfYIpGpQc75JiS3eTZ lv5yDt4YCKb4t1i4o4TzIgTWTl5uNHsPOV/Mw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:date :message-id:subject:from:to:cc; bh=a7grb7GykBhP/q1StK14pz+kpVo/kJCEt4hIFM21ftk=; b=kQNurqNu6S0NyA7NZGLKI7rSQ+zRdXYtfHXXj6EGUiaDAM+Do3D4n1N/zayQU+9ym8 FEm1nIEA4J++9gLXi0jrXEDeysNiX4V423r/tG+utmo58ObwCG9Ngponyj6L7ysV8FmJ E/C1FSvrurLMLlLRn9J7llQ+Ea7ZO6jZtQ0r4IwTU3+Ab1e+1BtQwPmsS8dlzQ28Sdwe n+nGVWSW8AbmAQJNZeHA5HutZbp9JUNSbHFra2Xvr+2rzHv0ExkgwShRCaSSrP93TDcI 0PY7eLB02KXe7vnpNzfjJM/aFxkz2Z5+xoQXUBXGp7rLhUgz4BMAgIetdnxcjQ+SXCIX oQoQ== X-Gm-Message-State: AOPr4FUZJuXany4r4m6RO1dqO6HK6omRdC86wbOd/Ktuv8IgQWazSFGDNWmRisSfAtGPfGfGf/3jfh8oMh2QbA== MIME-Version: 1.0 X-Received: by 10.36.254.136 with SMTP id w130mr6667574ith.49.1463597485163; Wed, 18 May 2016 11:51:25 -0700 (PDT) Received: by 10.36.160.140 with HTTP; Wed, 18 May 2016 11:51:25 -0700 (PDT) In-Reply-To: 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> Date: Wed, 18 May 2016 11:51:25 -0700 X-Google-Sender-Auth: U0fQcQYGiiekQ4qPyPAbgLE0PTU Message-ID: Subject: Re: [GIT] Networking From: Linus Torvalds To: "Coelho, Luciano" Cc: "reinoudkoornstra@gmail.com" , "linux-kernel@vger.kernel.org" , linuxwifi , "Berg, Johannes" , "akpm@linux-foundation.org" , "kvalo@codeaurora.org" , "egrumbach@gmail.com" , "netdev@vger.kernel.org" , "davem@davemloft.net" , "linux-wireless@vger.kernel.org" , "Grumbach, Emmanuel" Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,T_TVD_MIME_EPI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Wed, May 18, 2016 at 11:45 AM, Linus Torvalds 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? Linus drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c index 880210917a6f..c53aa0f220e0 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;