From fc4e31cbc341b95024f51f732ab2b31f92c1db7b Mon Sep 17 00:00:00 2001
From: "Gustavo F. Padovan" <padovan@profusion.mobi>
Date: Wed, 14 Dec 2011 22:52:31 -0200
Subject: [PATCH] --- yaml --- r: 279256 b: refs/heads/master c:
 3e9c40a6f72a4ee7a978204cac00f91ad08bbe9b h: refs/heads/master v: v3

---
 [refs]                         |  2 +-
 trunk/net/bluetooth/hci_conn.c | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 42e1ed28f2ef..d5e516b91f20 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9c3123b5a7c9585902927b14983e6635aca00c6
+refs/heads/master: 3e9c40a6f72a4ee7a978204cac00f91ad08bbe9b
diff --git a/trunk/net/bluetooth/hci_conn.c b/trunk/net/bluetooth/hci_conn.c
index 1a076941829b..dfe807fb7e79 100644
--- a/trunk/net/bluetooth/hci_conn.c
+++ b/trunk/net/bluetooth/hci_conn.c
@@ -807,17 +807,11 @@ void hci_conn_enter_sniff_mode(struct hci_conn *conn)
 void hci_conn_hash_flush(struct hci_dev *hdev)
 {
 	struct hci_conn_hash *h = &hdev->conn_hash;
-	struct list_head *p;
+	struct hci_conn *c;
 
 	BT_DBG("hdev %s", hdev->name);
 
-	p = h->list.next;
-	while (p != &h->list) {
-		struct hci_conn *c;
-
-		c = list_entry(p, struct hci_conn, list);
-		p = p->next;
-
+	list_for_each_entry(c, &h->list, list) {
 		c->state = BT_CLOSED;
 
 		hci_proto_disconn_cfm(c, HCI_ERROR_LOCAL_HOST_TERM);