All of lore.kernel.org
 help / color / mirror / Atom feed
From: Luca Coelho <luca@coelho.fi>
To: linux-wireless@vger.kernel.org
Cc: kvalo@codeaurora.org, Johannes Berg <johannes.berg@intel.com>,
	Luca Coelho <luciano.coelho@intel.com>
Subject: [PATCH 08/25] iwlwifi: mvm: avoid variable shadowing
Date: Fri, 23 Jun 2017 00:20:44 +0300	[thread overview]
Message-ID: <20170622212101.16422-9-luca@coelho.fi> (raw)
In-Reply-To: <20170622212101.16422-1-luca@coelho.fi>

From: Johannes Berg <johannes.berg@intel.com>

Avoid one kind of symbol shadowing another in iwl_mvm_flush_sta()
by renaming the function parameter.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
 drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 2 +-
 drivers/net/wireless/intel/iwlwifi/mvm/tx.c  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index 9a9163f64553..cdd13bc343e6 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -1370,7 +1370,7 @@ const char *iwl_mvm_get_tx_fail_reason(u32 status);
 static inline const char *iwl_mvm_get_tx_fail_reason(u32 status) { return ""; }
 #endif
 int iwl_mvm_flush_tx_path(struct iwl_mvm *mvm, u32 tfd_msk, u32 flags);
-int iwl_mvm_flush_sta(struct iwl_mvm *mvm, void *sta, bool int_sta, u32 flags);
+int iwl_mvm_flush_sta(struct iwl_mvm *mvm, void *sta, bool internal, u32 flags);
 
 void iwl_mvm_async_handlers_purge(struct iwl_mvm *mvm);
 
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
index 63b938028144..da05801c9ca1 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
@@ -1904,11 +1904,11 @@ int iwl_mvm_flush_tx_path(struct iwl_mvm *mvm, u32 tfd_msk, u32 flags)
 	return ret;
 }
 
-int iwl_mvm_flush_sta(struct iwl_mvm *mvm, void *sta, bool int_sta, u32 flags)
+int iwl_mvm_flush_sta(struct iwl_mvm *mvm, void *sta, bool internal, u32 flags)
 {
 	u32 mask;
 
-	if (int_sta) {
+	if (internal) {
 		struct iwl_mvm_int_sta *int_sta = sta;
 
 		mask = int_sta->tfd_queue_msk;
-- 
2.11.0

  parent reply	other threads:[~2017-06-22 21:21 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-22 21:20 [PATCH 00/25] iwlwifi: updates intended for v4.13 2017-06-23 Luca Coelho
2017-06-22 21:20 ` [PATCH 01/25] iwlwifi: mvm: remove txq EMPTYING_DELBA state for DQA Luca Coelho
2017-06-22 21:20 ` [PATCH 02/25] iwlwifi: remove resp_pkt NULL checks Luca Coelho
2017-06-22 21:20 ` [PATCH 03/25] iwlwifi: mvm: disable dbg data collect when fw isn't alive Luca Coelho
2017-06-22 21:20 ` [PATCH 04/25] iwlwifi: mvm: Enable security on new TX API Luca Coelho
2017-06-22 21:20 ` [PATCH 05/25] iwlwifi: mvm: avoid unnecessary cache trashing in Tx path Luca Coelho
2017-06-22 21:20 ` [PATCH 06/25] iwlwifi: mvm: remove pointless num_stored condition Luca Coelho
2017-06-22 21:20 ` [PATCH 07/25] iwlwifi: pcie: fix TVQM queue ID range check Luca Coelho
2017-06-22 21:20 ` Luca Coelho [this message]
2017-06-22 21:20 ` [PATCH 09/25] iwlwifi: mvm: use scnprintf() instead of snprintf() Luca Coelho
2017-06-22 21:20 ` [PATCH 10/25] iwlwifi: use bitfield.h for some registers Luca Coelho
2017-06-22 21:20 ` [PATCH 11/25] iwlwifi: mvm: track and report IBSS manager status to mac80211 Luca Coelho
2017-06-22 21:20 ` [PATCH 12/25] iwlwifi: mvm: make D0I3_END_CMD sync during system resume Luca Coelho
2017-06-22 21:20 ` [PATCH 13/25] iwlwifi: mvm: support D0I3_END_CMD at the start of resume Luca Coelho
2017-06-22 21:20 ` [PATCH 14/25] iwlwifi: mvm: change the firmware name loading Luca Coelho
2017-06-22 21:20 ` [PATCH 15/25] iwlwifi: mvm: make iwl_mvm_update_mcc() easier to follow Luca Coelho
2017-06-22 21:20 ` [PATCH 16/25] iwlwifi: mvm: rs: add logs for the wrong antenna case Luca Coelho
2017-06-22 21:20 ` [PATCH 17/25] iwlwifi: pcie: pull out common rfkill IRQ handling code Luca Coelho
2017-06-22 21:20 ` [PATCH 18/25] iwlwifi: pcie: add fake RF-kill to debugfs Luca Coelho
2017-06-22 21:20 ` [PATCH 19/25] iwlwifi: mvm: don't warn in queue sync on RF-kill Luca Coelho
2017-06-22 21:20 ` [PATCH 20/25] iwlwifi: pcie: don't report RF-kill enabled while shutting down Luca Coelho
2017-06-22 21:20 ` [PATCH 21/25] iwlwifi: pcie: remove pointless debugfs parsing for csr file Luca Coelho
2017-06-22 21:20 ` [PATCH 22/25] iwlwifi: mvm: document status bits Luca Coelho
2017-06-22 21:20 ` [PATCH 23/25] iwlwifi: mvm: support aggregations on A000 HW Luca Coelho
2017-06-22 21:21 ` [PATCH 24/25] iwlwifi: pcie: use kstrtou32_from_user() Luca Coelho
2017-06-22 21:21 ` [PATCH 25/25] iwlwifi: mvm: better link scan notification results length Luca Coelho

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=20170622212101.16422-9-luca@coelho.fi \
    --to=luca@coelho.fi \
    --cc=johannes.berg@intel.com \
    --cc=kvalo@codeaurora.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=luciano.coelho@intel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.