diff options
| author |   Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2011-10-10 07:27:16 -0700 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2011-10-14 14:48:13 -0400 |
| commit | 8c22254454eaa4f483103c6850f6f16d4f09c161 (patch) | |
| tree | bdec5ff4a385753bd3ddf9a70523dafb714925ab /drivers/net/wireless/iwlwifi/iwl-helpers.h | |
| parent | iwlagn: remove 6000 hw header (diff) | |
| download | linux-dev-8c22254454eaa4f483103c6850f6f16d4f09c161.tar.xz linux-dev-8c22254454eaa4f483103c6850f6f16d4f09c161.zip | |
iwlagn: move iwl_beacon_time_mask_XXX near to usage
Since iwl_beacon_time_mask_[high,low] are used in iwl-core.c only,
move them to there.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-helpers.h | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-helpers.h b/drivers/net/wireless/iwlwifi/iwl-helpers.h index 968fc66e3506..b7cf992fcc62 100644 --- a/drivers/net/wireless/iwlwifi/iwl-helpers.h +++ b/drivers/net/wireless/iwlwifi/iwl-helpers.h @@ -35,38 +35,10 @@ #include "iwl-io.h" -static inline struct ieee80211_conf *ieee80211_get_hw_conf( - struct ieee80211_hw *hw) -{ - return &hw->conf; -} - static inline void iwl_enable_rfkill_int(struct iwl_priv *priv) { IWL_DEBUG_ISR(priv, "Enabling rfkill interrupt\n"); iwl_write32(bus(priv), CSR_INT_MASK, CSR_INT_BIT_RF_KILL); } -/** - * iwl_beacon_time_mask_low - mask of lower 32 bit of beacon time - * @priv -- pointer to iwl_priv data structure - * @tsf_bits -- number of bits need to shift for masking) - */ -static inline u32 iwl_beacon_time_mask_low(struct iwl_priv *priv, - u16 tsf_bits) -{ - return (1 << tsf_bits) - 1; -} - -/** - * iwl_beacon_time_mask_high - mask of higher 32 bit of beacon time - * @priv -- pointer to iwl_priv data structure - * @tsf_bits -- number of bits need to shift for masking) - */ -static inline u32 iwl_beacon_time_mask_high(struct iwl_priv *priv, - u16 tsf_bits) -{ - return ((1 << (32 - tsf_bits)) - 1) << tsf_bits; -} - #endif /* __iwl_helpers_h__ */ |