From 0994aad2bde25d6a0b22ef88c3b9094ce180d64a Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 5 Mar 2012 11:24:43 -0800
Subject: [PATCH] --- yaml --- r: 291191 b: refs/heads/master c:
 930dfd5f20eba2cef41cdb2db04108b359b97594 h: refs/heads/master i:   291189:
 9c952ed58d5408ce11c3b409bf4e4e3ee176d451   291187:
 d266ff69ca786410b7f614a3e6d77f0e2ea3b35f   291183:
 ae5c1edae824be1ac33ca50b54844ca1e7181d1f v: v3

---
 [refs]                                          |  2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl-shared.h | 17 -----------------
 trunk/drivers/net/wireless/iwlwifi/iwl-trans.h  | 17 +++++++++++++++++
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index b663156caa50..e7b89a21f0b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bffc66ce2210b149fd171eccad2aef9802c0b35d
+refs/heads/master: 930dfd5f20eba2cef41cdb2db04108b359b97594
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h b/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h
index 787d726efbc8..2b9d21a7207d 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h
@@ -67,7 +67,6 @@
 #include <linux/spinlock.h>
 #include <linux/mutex.h>
 #include <linux/gfp.h>
-#include <linux/mm.h> /* for page_address */
 #include <net/mac80211.h>
 
 #include "iwl-commands.h"
@@ -413,22 +412,6 @@ static inline bool iwl_have_debug_level(u32 level)
 	return iwlagn_mod_params.debug_level & level;
 }
 
-struct iwl_rx_cmd_buffer {
-	struct page *_page;
-};
-
-static inline void *rxb_addr(struct iwl_rx_cmd_buffer *r)
-{
-	return page_address(r->_page);
-}
-
-static inline struct page *rxb_steal_page(struct iwl_rx_cmd_buffer *r)
-{
-	struct page *p = r->_page;
-	r->_page = NULL;
-	return p;
-}
-
 /*
  * mac80211 queues, ACs, hardware queues, FIFOs.
  *
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-trans.h b/trunk/drivers/net/wireless/iwlwifi/iwl-trans.h
index 0197f31f3bec..b09192a028de 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-trans.h
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-trans.h
@@ -64,6 +64,7 @@
 #define __iwl_trans_h__
 
 #include <linux/ieee80211.h>
+#include <linux/mm.h> /* for page_address */
 
 #include "iwl-shared.h"
 #include "iwl-debug.h"
@@ -201,6 +202,22 @@ static inline void iwl_free_resp(struct iwl_host_cmd *cmd)
 	free_pages(cmd->_rx_page_addr, cmd->_rx_page_order);
 }
 
+struct iwl_rx_cmd_buffer {
+	struct page *_page;
+};
+
+static inline void *rxb_addr(struct iwl_rx_cmd_buffer *r)
+{
+	return page_address(r->_page);
+}
+
+static inline struct page *rxb_steal_page(struct iwl_rx_cmd_buffer *r)
+{
+	struct page *p = r->_page;
+	r->_page = NULL;
+	return p;
+}
+
 /**
  * struct iwl_trans_ops - transport specific operations
  *