The following commit has been merged in the batman-adv/next branch: commit 71becf0cea91380200ab9460e5126aeff5d7420b Author: Andrei Emeltchenko andrei.emeltchenko@intel.com Date: Thu Jul 19 17:03:42 2012 +0300
Bluetooth: debug: Fix printing refcnt for hci_conn
Use the same style for refcnt printing through all Bluetooth code taking the reference the l2cap_chan refcnt printing.
Signed-off-by: Andrei Emeltchenko andrei.emeltchenko@intel.com Signed-off-by: Gustavo Padovan gustavo.padovan@collabora.co.uk
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 5c7a5f8..03b8b65 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -581,8 +581,7 @@ void hci_conn_put_device(struct hci_conn *conn);
static inline void hci_conn_hold(struct hci_conn *conn) { - BT_DBG("hcon %p refcnt %d -> %d", conn, atomic_read(&conn->refcnt), - atomic_read(&conn->refcnt) + 1); + BT_DBG("hcon %p orig refcnt %d", conn, atomic_read(&conn->refcnt));
atomic_inc(&conn->refcnt); cancel_delayed_work(&conn->disc_work); @@ -590,8 +589,7 @@ static inline void hci_conn_hold(struct hci_conn *conn)
static inline void hci_conn_put(struct hci_conn *conn) { - BT_DBG("hcon %p refcnt %d -> %d", conn, atomic_read(&conn->refcnt), - atomic_read(&conn->refcnt) - 1); + BT_DBG("hcon %p orig refcnt %d", conn, atomic_read(&conn->refcnt));
if (atomic_dec_and_test(&conn->refcnt)) { unsigned long timeo;