---

yaml --- r: 246910 b: refs/heads/master c: baa7e1f h: refs/heads/master v: v3
git-mirror · Apr 7, 2011 · c7e50a1 · c7e50a1
1 parent 4edc950
commit c7e50a1
Show file tree

Hide file tree

Showing 3 changed files with 89 additions and 113 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48454079c2d4b9ee65c570a22c5fdfe1827996a4
+refs/heads/master: baa7e1fa6d2870462bd744df1c6ddbd497fe86d6
diff --git a/trunk/include/net/bluetooth/l2cap.h b/trunk/include/net/bluetooth/l2cap.h
@@ -277,16 +277,9 @@ struct l2cap_conn_param_update_rsp {
 #define L2CAP_CONN_PARAM_REJECTED	0x0001
 
 /* ----- L2CAP channels and connections ----- */
-
 struct l2cap_chan {
 	struct sock *sk;
-	struct l2cap_chan	*next_c;
-	struct l2cap_chan	*prev_c;
-};
-
-struct l2cap_chan_list {
-	struct l2cap_chan *head;
-	rwlock_t	lock;
+	struct list_head list;
 };
 
 struct l2cap_conn {
@@ -312,7 +305,8 @@ struct l2cap_conn {
 
 	__u8		disc_reason;
 
-	struct l2cap_chan_list chan_list;
+	struct list_head chan_l;
+	rwlock_t	chan_lock;
 };
 
 struct sock_del_list {