---

yaml --- r: 256394 b: refs/heads/master c: f8c1fbd h: refs/heads/master v: v3
git-mirror · Jul 1, 2011 · 0b7fff1 · 0b7fff1
1 parent a3e7192
commit 0b7fff1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2461daacb3e2ecca5edea2fa637a1b0922e86515
+refs/heads/master: f8c1fbdb767f7487983b369a0b07ddc82b29f709
diff --git a/trunk/include/net/bluetooth/hci_core.h b/trunk/include/net/bluetooth/hci_core.h
@@ -223,7 +223,6 @@ struct hci_conn {
 	struct list_head list;
 
 	atomic_t	refcnt;
-	spinlock_t	lock;
 
 	bdaddr_t	dst;
 	__u8		dst_type;
@@ -272,7 +271,6 @@ struct hci_conn {
 	struct hci_dev	*hdev;
 	void		*l2cap_data;
 	void		*sco_data;
-	void		*priv;
 
 	struct hci_conn	*link;