iwlagn: generic bt coex functions

Move bt coex functions to iwl-agn-lib.c, so those functions
can be shared by multiple wifi/bt combo devices

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 37 insertions, 37 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h
index 5df22f1d57a5..8ed2412862d7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-commands.h
+++ b/drivers/net/wireless/iwlwifi/iwl-commands.h
@@ -2411,52 +2411,52 @@ struct iwl_bt_cmd {
 	__le32 kill_cts_mask;
 } __packed;
 
-#define IWL6000G2B_BT_FLAG_CHANNEL_INHIBITION	BIT(0)
+#define IWLAGN_BT_FLAG_CHANNEL_INHIBITION	BIT(0)
 
-#define IWL6000G2B_BT_FLAG_COEX_MODE_MASK	(BIT(3)|BIT(4)|BIT(5))
-#define IWL6000G2B_BT_FLAG_COEX_MODE_SHIFT	3
-#define IWL6000G2B_BT_FLAG_COEX_MODE_DISABLED	0
-#define IWL6000G2B_BT_FLAG_COEX_MODE_LEGACY_2W	1
-#define IWL6000G2B_BT_FLAG_COEX_MODE_3W		2
-#define IWL6000G2B_BT_FLAG_COEX_MODE_4W		3
+#define IWLAGN_BT_FLAG_COEX_MODE_MASK		(BIT(3)|BIT(4)|BIT(5))
+#define IWLAGN_BT_FLAG_COEX_MODE_SHIFT		3
+#define IWLAGN_BT_FLAG_COEX_MODE_DISABLED	0
+#define IWLAGN_BT_FLAG_COEX_MODE_LEGACY_2W	1
+#define IWLAGN_BT_FLAG_COEX_MODE_3W		2
+#define IWLAGN_BT_FLAG_COEX_MODE_4W		3
 
-#define IWL6000G2B_BT_FLAG_UCODE_DEFAULT	BIT(6)
-#define IWL6000G2B_BT_FLAG_NOCOEX_NOTIF		BIT(7)
+#define IWLAGN_BT_FLAG_UCODE_DEFAULT	BIT(6)
+#define IWLAGN_BT_FLAG_NOCOEX_NOTIF	BIT(7)
 
-#define IWL6000G2B_BT_PRIO_BOOST_MAX		0xFF
-#define IWL6000G2B_BT_PRIO_BOOST_MIN		0x00
-#define IWL6000G2B_BT_PRIO_BOOST_DEFAULT	0xF0
+#define IWLAGN_BT_PRIO_BOOST_MAX	0xFF
+#define IWLAGN_BT_PRIO_BOOST_MIN	0x00
+#define IWLAGN_BT_PRIO_BOOST_DEFAULT	0xF0
 
-#define IWL6000G2B_BT_MAX_KILL_DEFAULT		5
+#define IWLAGN_BT_MAX_KILL_DEFAULT	5
 
-#define IWL6000G2B_BT3_T7_DEFAULT		1
+#define IWLAGN_BT3_T7_DEFAULT		1
 
-#define IWL6000G2B_BT_KILL_ACK_MASK_DEFAULT	cpu_to_le32(0xffffffff)
-#define IWL6000G2B_BT_KILL_CTS_MASK_DEFAULT	cpu_to_le32(0xffffffff)
+#define IWLAGN_BT_KILL_ACK_MASK_DEFAULT	cpu_to_le32(0xffffffff)
+#define IWLAGN_BT_KILL_CTS_MASK_DEFAULT	cpu_to_le32(0xffffffff)
 
-#define IWL6000G2B_BT3_PRIO_SAMPLE_DEFAULT	2
+#define IWLAGN_BT3_PRIO_SAMPLE_DEFAULT	2
 
-#define IWL6000G2B_BT3_T2_DEFAULT		0xc
+#define IWLAGN_BT3_T2_DEFAULT		0xc
 
-#define IWL6000G2B_BT_VALID_ENABLE_FLAGS	cpu_to_le16(BIT(0))
-#define IWL6000G2B_BT_VALID_BOOST		cpu_to_le16(BIT(1))
-#define IWL6000G2B_BT_VALID_MAX_KILL		cpu_to_le16(BIT(2))
-#define IWL6000G2B_BT_VALID_3W_TIMERS		cpu_to_le16(BIT(3))
-#define IWL6000G2B_BT_VALID_KILL_ACK_MASK	cpu_to_le16(BIT(4))
-#define IWL6000G2B_BT_VALID_KILL_CTS_MASK	cpu_to_le16(BIT(5))
-#define IWL6000G2B_BT_VALID_BT4_TIMES		cpu_to_le16(BIT(6))
-#define IWL6000G2B_BT_VALID_3W_LUT		cpu_to_le16(BIT(7))
+#define IWLAGN_BT_VALID_ENABLE_FLAGS	cpu_to_le16(BIT(0))
+#define IWLAGN_BT_VALID_BOOST		cpu_to_le16(BIT(1))
+#define IWLAGN_BT_VALID_MAX_KILL	cpu_to_le16(BIT(2))
+#define IWLAGN_BT_VALID_3W_TIMERS	cpu_to_le16(BIT(3))
+#define IWLAGN_BT_VALID_KILL_ACK_MASK	cpu_to_le16(BIT(4))
+#define IWLAGN_BT_VALID_KILL_CTS_MASK	cpu_to_le16(BIT(5))
+#define IWLAGN_BT_VALID_BT4_TIMES	cpu_to_le16(BIT(6))
+#define IWLAGN_BT_VALID_3W_LUT		cpu_to_le16(BIT(7))
 
-#define IWL6000G2B_BT_ALL_VALID_MSK	(IWL6000G2B_BT_VALID_ENABLE_FLAGS | \
-					IWL6000G2B_BT_VALID_BOOST | \
-					IWL6000G2B_BT_VALID_MAX_KILL | \
-					IWL6000G2B_BT_VALID_3W_TIMERS | \
-					IWL6000G2B_BT_VALID_KILL_ACK_MASK | \
-					IWL6000G2B_BT_VALID_KILL_CTS_MASK | \
-					IWL6000G2B_BT_VALID_BT4_TIMES | \
-					IWL6000G2B_BT_VALID_3W_LUT)
+#define IWLAGN_BT_ALL_VALID_MSK		(IWLAGN_BT_VALID_ENABLE_FLAGS | \
+					IWLAGN_BT_VALID_BOOST | \
+					IWLAGN_BT_VALID_MAX_KILL | \
+					IWLAGN_BT_VALID_3W_TIMERS | \
+					IWLAGN_BT_VALID_KILL_ACK_MASK | \
+					IWLAGN_BT_VALID_KILL_CTS_MASK | \
+					IWLAGN_BT_VALID_BT4_TIMES | \
+					IWLAGN_BT_VALID_3W_LUT)
 
-struct iwl6000g2b_bt_cmd {
+struct iwlagn_bt_cmd {
 	u8 flags;
 	u8 ledtime; /* unused */
 	u8 max_kill;
@@ -2473,9 +2473,9 @@ struct iwl6000g2b_bt_cmd {
 	u8 reserved[3];
 };
 
-#define IWL6000G2B_BT_SCO_ACTIVE	cpu_to_le32(BIT(0))
+#define IWLAGN_BT_SCO_ACTIVE	cpu_to_le32(BIT(0))
 
-struct iwl6000g2b_bt_sco_cmd {
+struct iwlagn_bt_sco_cmd {
 	__le32 flags;
 };