From cbfee86248ff6ea8ae3bc462cb1b0049f162d7f4 Mon Sep 17 00:00:00 2001
From: Mat Martineau <mathewm@codeaurora.org>
Date: Wed, 2 Nov 2011 16:18:28 -0700
Subject: [PATCH] --- yaml --- r: 277727 b: refs/heads/master c:
 c14968b0c1792901ac1cbbbf18f42e37b5a6f4df h: refs/heads/master i:   277725:
 8cd6c6146dde3f81eb0dd0d843bb81c8ea1a1004   277723:
 72af848736d5b7acb8bad56be08aa9d5c7010b12   277719:
 5ff281cffc31fe401fcc3b6ccb86f7a901b5f5b9   277711:
 34d315914c0eddef6c739138ab52d5ad65c5fe13   277695:
 c6cd586e7ffebb5e8c47bda2b41c199b17a349b2 v: v3

---
 [refs]                                  |  2 +-
 trunk/include/net/bluetooth/bluetooth.h | 27 +++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 862d742eb8a0..c260b1ebe050 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b3c7104677a731cf6d3638e09d9d6c530b9bc25
+refs/heads/master: c14968b0c1792901ac1cbbbf18f42e37b5a6f4df
diff --git a/trunk/include/net/bluetooth/bluetooth.h b/trunk/include/net/bluetooth/bluetooth.h
index fb1acb3454ae..38cd3dab7f1d 100644
--- a/trunk/include/net/bluetooth/bluetooth.h
+++ b/trunk/include/net/bluetooth/bluetooth.h
@@ -77,6 +77,33 @@ struct bt_power {
 #define BT_POWER_FORCE_ACTIVE_OFF 0
 #define BT_POWER_FORCE_ACTIVE_ON  1
 
+#define BT_CHANNEL_POLICY	10
+
+/* BR/EDR only (default policy)
+ *   AMP controllers cannot be used.
+ *   Channel move requests from the remote device are denied.
+ *   If the L2CAP channel is currently using AMP, move the channel to BR/EDR.
+ */
+#define BT_CHANNEL_POLICY_BREDR_ONLY		0
+
+/* BR/EDR Preferred
+ *   Allow use of AMP controllers.
+ *   If the L2CAP channel is currently on AMP, move it to BR/EDR.
+ *   Channel move requests from the remote device are allowed.
+ */
+#define BT_CHANNEL_POLICY_BREDR_PREFERRED	1
+
+/* AMP Preferred
+ *   Allow use of AMP controllers
+ *   If the L2CAP channel is currently on BR/EDR and AMP controller
+ *     resources are available, initiate a channel move to AMP.
+ *   Channel move requests from the remote device are allowed.
+ *   If the L2CAP socket has not been connected yet, try to create
+ *     and configure the channel directly on an AMP controller rather
+ *     than BR/EDR.
+ */
+#define BT_CHANNEL_POLICY_AMP_PREFERRED		2
+
 __attribute__((format (printf, 2, 3)))
 int bt_printk(const char *level, const char *fmt, ...);