lkml.org 
[lkml]   [2011]   [Nov]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the bluetooth tree with Linus' tree
Hi Gustavo,

Today's linux-next merge of the bluetooth tree got a conflict in
include/net/bluetooth/bluetooth.h between commit b9075fa968a0 ("treewide:
use __printf not __attribute__((format(printf,...)))") from Linus' tree
and commit 5254c96d4e25 ("Bluetooth: Add BT_CHANNEL_POLICY socket
option") from the bluetooth tree.

Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc include/net/bluetooth/bluetooth.h
index e86af08,38cd3da..0000000
--- 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)
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2011-11-04 03:57    [W:0.021 / U:0.644 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site