Merge git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth

2012-05-16 16:11:44 -03:00
parent d34c34fb25 671267bf3a
commit 08e6d907fe
8 changed files with 45 additions and 20 deletions
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -195,6 +195,7 @@ struct bt_sock {
 	struct list_head accept_q;
 	struct sock *parent;
 	u32 defer_setup;
+	bool suspended;
 };

 struct bt_sock_list {