diff options
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-helpers.h | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c index b06a7bd8b285..7d74ae53950c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945.c | |||
@@ -348,7 +348,7 @@ static void iwl3945_rx_reply_tx(struct iwl_priv *priv, | |||
348 | IWL_DEBUG_TX_REPLY(priv, "Tx queue reclaim %d\n", index); | 348 | IWL_DEBUG_TX_REPLY(priv, "Tx queue reclaim %d\n", index); |
349 | iwl3945_tx_queue_reclaim(priv, txq_id, index); | 349 | iwl3945_tx_queue_reclaim(priv, txq_id, index); |
350 | 350 | ||
351 | if (iwl_check_bits(status, TX_ABORT_REQUIRED_MSK)) | 351 | if (status & TX_ABORT_REQUIRED_MSK) |
352 | IWL_ERR(priv, "TODO: Implement Tx ABORT REQUIRED!!!\n"); | 352 | IWL_ERR(priv, "TODO: Implement Tx ABORT REQUIRED!!!\n"); |
353 | } | 353 | } |
354 | 354 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-helpers.h b/drivers/net/wireless/iwlwifi/iwl-helpers.h index 621abe3c5afc..1aaef70deaec 100644 --- a/drivers/net/wireless/iwlwifi/iwl-helpers.h +++ b/drivers/net/wireless/iwlwifi/iwl-helpers.h | |||
@@ -44,11 +44,6 @@ static inline struct ieee80211_conf *ieee80211_get_hw_conf( | |||
44 | return &hw->conf; | 44 | return &hw->conf; |
45 | } | 45 | } |
46 | 46 | ||
47 | static inline int iwl_check_bits(unsigned long field, unsigned long mask) | ||
48 | { | ||
49 | return ((field & mask) == mask) ? 1 : 0; | ||
50 | } | ||
51 | |||
52 | static inline unsigned long elapsed_jiffies(unsigned long start, | 47 | static inline unsigned long elapsed_jiffies(unsigned long start, |
53 | unsigned long end) | 48 | unsigned long end) |
54 | { | 49 | { |