From 9c089633e66fb5abd83abe409429bcb4a40e9574 Mon Sep 17 00:00:00 2001
From: Mat Martineau <mathewm@codeaurora.org>
Date: Wed, 2 Nov 2011 16:18:33 -0700
Subject: [PATCH] --- yaml --- r: 277732 b: refs/heads/master c:
 d835ac0fc73276893af63a478317027787a3ac1f h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ec5c5f9b16dd..1e89eb102f3f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f94ff6fff7b8b5896a173d165e9ec579c83067f2
+refs/heads/master: d835ac0fc73276893af63a478317027787a3ac1f
diff --git a/trunk/include/net/bluetooth/l2cap.h b/trunk/include/net/bluetooth/l2cap.h
index 88d462a4ee78..9280bff55430 100644
--- a/trunk/include/net/bluetooth/l2cap.h
+++ b/trunk/include/net/bluetooth/l2cap.h
@@ -119,6 +119,10 @@ struct l2cap_conninfo {
 #define L2CAP_FCS_NONE		0x00
 #define L2CAP_FCS_CRC16		0x01
 
+/* L2CAP fixed channels */
+#define L2CAP_FC_L2CAP		0x02
+#define L2CAP_FC_A2MP		0x08
+
 /* L2CAP Control Field bit masks */
 #define L2CAP_CTRL_SAR			0xC000
 #define L2CAP_CTRL_REQSEQ		0x3F00