From: Luca Coelho <luca@coelho.fi>
To: linus@linuxfoundation.org
Cc: linux-wireless@vger.kernel.org, reinoudkoornstra@gmail.com,
linux-kernel@vger.kernel.org, linuxwifi@intel.com,
johannes.berg@intel.com, akpm@linux-foundation.org,
kvalo@codeaurora.org, egrumbach@gmail.com,
netdev@vger.kernel.org, davem@davemloft.net
Subject: [PATCH] iwlwifi: mvm: fix merge damage in tx.c
Date: Wed, 18 May 2016 22:00:09 +0300 [thread overview]
Message-ID: <1463598009-31865-1-git-send-email-luca@coelho.fi> (raw)
In-Reply-To: <1463597411.29999.16.camel@intel.com>
From: Luca Coelho <luciano.coelho@intel.com>
During the merge in commit 909b27f70643 ("Merge
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net"), there was a
small merge damage where one instance of info was not converted into
skb_info. Fix this.
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
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 8802109..c53aa0f 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;
--
2.8.1
next prev parent reply other threads:[~2016-05-18 19:34 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-17 19:11 [GIT] Networking David Miller
2016-05-18 1:00 ` Linus Torvalds
2016-05-18 3:37 ` Emmanuel Grumbach
2016-05-18 10:51 ` Coelho, Luciano
2016-05-18 12:20 ` Reinoud Koornstra
2016-05-18 12:41 ` Coelho, Luciano
2016-05-18 12:51 ` Reinoud Koornstra
2016-05-18 14:23 ` Coelho, Luciano
2016-05-18 18:45 ` Linus Torvalds
2016-05-18 18:50 ` Coelho, Luciano
2016-05-18 18:58 ` Kalle Valo
2016-05-18 19:00 ` Linus Torvalds
2016-05-18 19:03 ` Coelho, Luciano
2016-05-18 19:11 ` Kalle Valo
2016-05-18 19:00 ` Luca Coelho [this message]
2016-05-18 18:51 ` Linus Torvalds
2016-05-19 8:20 ` Reinoud Koornstra
2016-05-19 9:14 ` Reinoud Koornstra
2016-05-19 9:40 ` Sedat Dilek
2016-05-19 4:08 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1463598009-31865-1-git-send-email-luca@coelho.fi \
--to=luca@coelho.fi \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=egrumbach@gmail.com \
--cc=johannes.berg@intel.com \
--cc=kvalo@codeaurora.org \
--cc=linus@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linuxwifi@intel.com \
--cc=netdev@vger.kernel.org \
--cc=reinoudkoornstra@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).