---

yaml --- r: 306863 b: refs/heads/master c: 00e3112 h: refs/heads/master i: 306861: f99db1f 306859: 29ed5a2 306855: 1e647a3 306847: deac404 v: v3
git-mirror · May 9, 2012 · a71d318 · a71d318
1 parent 3cf734d
commit a71d318
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5f7ac38102c12069de247890cfdd357bf845a77
+refs/heads/master: 00e3112c5a90963bb7b56e0648d22fc51ed17d23
diff --git a/trunk/include/net/bluetooth/bluetooth.h b/trunk/include/net/bluetooth/bluetooth.h
@@ -215,6 +215,18 @@ void bt_accept_unlink(struct sock *sk);
 struct sock *bt_accept_dequeue(struct sock *parent, struct socket *newsock);
 
 /* Skb helpers */
+struct l2cap_ctrl {
+	unsigned int	sframe	: 1,
+			poll	: 1,
+			final	: 1,
+			fcs	: 1,
+			sar	: 2,
+			super	: 2;
+	__u16		reqseq;
+	__u16		txseq;
+	__u8		retries;
+};
+
 struct bt_skb_cb {
 	__u8 pkt_type;
 	__u8 incoming;
@@ -223,6 +235,7 @@ struct bt_skb_cb {
 	__u8 retries;
 	__u8 sar;
 	__u8 force_active;
+	struct l2cap_ctrl control;
 };
 #define bt_cb(skb) ((struct bt_skb_cb *)((skb)->cb))