From 0b7fff1428f7a8a90ad65ef2e86ffadc686962df Mon Sep 17 00:00:00 2001
From: "Gustavo F. Padovan" <padovan@profusion.mobi>
Date: Fri, 17 Jun 2011 15:46:46 -0300
Subject: [PATCH] --- yaml --- r: 256394 b: refs/heads/master c:
 f8c1fbdb767f7487983b369a0b07ddc82b29f709 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/include/net/bluetooth/hci_core.h | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 914f2e78089b..a214c1818821 100644
--- 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
index 26233d4d371c..90d81f9b19a2 100644
--- 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;