diff options
| author | Gregory Greenman <gregory.greenman@intel.com> | 2012-05-16 16:54:24 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-05 15:32:12 -0400 |
| commit | ff110c8f93cb7e2bd83f52a176e33c3573163f0a (patch) | |
| tree | 984914d182341380cca394b0576b2f5fee95918c /drivers/net/wireless | |
| parent | eec373f026f445191e6cc4a3fda7eb6b291144b1 (diff) | |
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')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans.h | 2 |
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 @@ | |||
| 78 | /* FIXME: need to abstract out TX command (once we know what it looks like) */ | 78 | /* FIXME: need to abstract out TX command (once we know what it looks like) */ |
| 79 | #include "iwl-commands.h" | 79 | #include "iwl-commands.h" |
| 80 | 80 | ||
| 81 | #define IWL_MASK(lo, hi) ((1 << (hi)) | ((1 << (hi)) - (1 << (lo)))) | ||
| 82 | |||
| 83 | #define SCD_QUEUECHAIN_SEL_ALL(trans, trans_pcie) \ | 81 | #define SCD_QUEUECHAIN_SEL_ALL(trans, trans_pcie) \ |
| 84 | (((1<<trans->cfg->base_params->num_of_queues) - 1) &\ | 82 | (((1<<trans->cfg->base_params->num_of_queues) - 1) &\ |
| 85 | (~(1<<(trans_pcie)->cmd_queue))) | 83 | (~(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) | |||
| 280 | 280 | ||
| 281 | #define MAX_NO_RECLAIM_CMDS 6 | 281 | #define MAX_NO_RECLAIM_CMDS 6 |
| 282 | 282 | ||
| 283 | #define IWL_MASK(lo, hi) ((1 << (hi)) | ((1 << (hi)) - (1 << (lo)))) | ||
| 284 | |||
| 283 | /* | 285 | /* |
| 284 | * Maximum number of HW queues the transport layer | 286 | * Maximum number of HW queues the transport layer |
| 285 | * currently supports | 287 | * currently supports |