summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi
diff options
context:
space:
mode:
authorGregory Greenman2012-05-16 22:54:24 +0200
committerJohn W. Linville2012-06-05 21:32:12 +0200
commitff110c8f93cb7e2bd83f52a176e33c3573163f0a (patch)
tree984914d182341380cca394b0576b2f5fee95918c /drivers/net/wireless/iwlwifi
parentiwlwifi: s/iwlagn_unmap_tfd/iwl_unmap_tfd (diff)
downloadkernel-qcow2-linux-ff110c8f93cb7e2bd83f52a176e33c3573163f0a.tar.gz
kernel-qcow2-linux-ff110c8f93cb7e2bd83f52a176e33c3573163f0a.tar.xz
kernel-qcow2-linux-ff110c8f93cb7e2bd83f52a176e33c3573163f0a.zip
iwlwifi: Move IWL_MASK macro to transport.
This macro is needed by other transports besides PCIe, thus moving to a common location. Signed-off-by: Gregory Greenman <gregory.greenman@intel.com> Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Reviewed-by: Wey-Yi W Guy <wey-yi.w.guy@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-trans-pcie.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-trans.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
index c11911864e62..12d84e9a2d64 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
@@ -78,8 +78,6 @@
/* FIXME: need to abstract out TX command (once we know what it looks like) */
#include "iwl-commands.h"
-#define IWL_MASK(lo, hi) ((1 << (hi)) | ((1 << (hi)) - (1 << (lo))))
-
#define SCD_QUEUECHAIN_SEL_ALL(trans, trans_pcie) \
(((1<<trans->cfg->base_params->num_of_queues) - 1) &\
(~(1<<(trans_pcie)->cmd_queue)))
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h
index 79a1e7ae4995..78b89f1f4b08 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/iwlwifi/iwl-trans.h
@@ -280,6 +280,8 @@ static inline struct page *rxb_steal_page(struct iwl_rx_cmd_buffer *r)
#define MAX_NO_RECLAIM_CMDS 6
+#define IWL_MASK(lo, hi) ((1 << (hi)) | ((1 << (hi)) - (1 << (lo))))
+
/*
* Maximum number of HW queues the transport layer
* currently supports