From a338040eb55839f12dd39681363cce3f627beefd Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 5 Mar 2012 11:24:42 -0800
Subject: [PATCH] --- yaml --- r: 291190 b: refs/heads/master c:
 bffc66ce2210b149fd171eccad2aef9802c0b35d h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 .../drivers/net/wireless/iwlwifi/iwl-shared.h | 20 -------------------
 .../net/wireless/iwlwifi/iwl-trans-pcie-int.h | 20 +++++++++++++++++++
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index ac662a80d71d..b663156caa50 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c977a33d84fb3d706faa0b62f9671f49b16dde34
+refs/heads/master: bffc66ce2210b149fd171eccad2aef9802c0b35d
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h b/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h
index ed1811d43550..787d726efbc8 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h
@@ -413,26 +413,6 @@ static inline bool iwl_have_debug_level(u32 level)
 	return iwlagn_mod_params.debug_level & level;
 }
 
-/**
- * iwl_queue_inc_wrap - increment queue index, wrap back to beginning
- * @index -- current index
- * @n_bd -- total number of entries in queue (must be power of 2)
- */
-static inline int iwl_queue_inc_wrap(int index, int n_bd)
-{
-	return ++index & (n_bd - 1);
-}
-
-/**
- * iwl_queue_dec_wrap - decrement queue index, wrap back to end
- * @index -- current index
- * @n_bd -- total number of entries in queue (must be power of 2)
- */
-static inline int iwl_queue_dec_wrap(int index, int n_bd)
-{
-	return --index & (n_bd - 1);
-}
-
 struct iwl_rx_cmd_buffer {
 	struct page *_page;
 };
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h b/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h
index 632d4099900e..44952c371d33 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h
@@ -115,6 +115,26 @@ struct iwl_dma_ptr {
 	size_t size;
 };
 
+/**
+ * iwl_queue_inc_wrap - increment queue index, wrap back to beginning
+ * @index -- current index
+ * @n_bd -- total number of entries in queue (must be power of 2)
+ */
+static inline int iwl_queue_inc_wrap(int index, int n_bd)
+{
+	return ++index & (n_bd - 1);
+}
+
+/**
+ * iwl_queue_dec_wrap - decrement queue index, wrap back to end
+ * @index -- current index
+ * @n_bd -- total number of entries in queue (must be power of 2)
+ */
+static inline int iwl_queue_dec_wrap(int index, int n_bd)
+{
+	return --index & (n_bd - 1);
+}
+
 /*
  * This queue number is required for proper operation
  * because the ucode will stop/start the scheduler as