From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 17 Nov 2011 18:11:43 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e11c259f745889b55bc5596ca78271f2f5cf08d2;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
	include/net/bluetooth/bluetooth.h
---

e11c259f745889b55bc5596ca78271f2f5cf08d2
diff --cc include/net/bluetooth/bluetooth.h
index e86af08293a8,38cd3dab7f1d..835f3b229b84
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@@ -77,7 -77,34 +77,34 @@@ 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)))
 +__printf(2, 3)
  int bt_printk(const char *level, const char *fmt, ...);
  
  #define BT_INFO(fmt, arg...)   bt_printk(KERN_INFO, pr_fmt(fmt), ##arg)