Skip to content

Commit

Permalink
Bluetooth: Use symbolic names for state in debug
Browse files Browse the repository at this point in the history
Use state_to_string function in debug statements.

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
  • Loading branch information
Andrei Emeltchenko authored and Johan Hedberg committed Feb 17, 2012
1 parent 20d1803 commit e05dcc3
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
3 changes: 2 additions & 1 deletion include/net/bluetooth/l2cap.h
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,8 @@ static inline void l2cap_chan_put(struct l2cap_chan *c)
static inline void l2cap_set_timer(struct l2cap_chan *chan,
struct delayed_work *work, long timeout)
{
BT_DBG("chan %p state %d timeout %ld", chan, chan->state, timeout);
BT_DBG("chan %p state %s timeout %ld", chan,
state_to_string(chan->state), timeout);

if (!cancel_delayed_work(work))
l2cap_chan_hold(chan);
Expand Down
2 changes: 1 addition & 1 deletion net/bluetooth/hci_conn.c
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ static void hci_conn_timeout(struct work_struct *work)
disc_work.work);
__u8 reason;

BT_DBG("conn %p state %d", conn, conn->state);
BT_DBG("conn %p state %s", conn, state_to_string(conn->state));

if (atomic_read(&conn->refcnt))
return;
Expand Down
5 changes: 3 additions & 2 deletions net/bluetooth/l2cap_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ static void l2cap_chan_timeout(struct work_struct *work)
struct sock *sk = chan->sk;
int reason;

BT_DBG("chan %p state %d", chan, chan->state);
BT_DBG("chan %p state %s", chan, state_to_string(chan->state));

lock_sock(sk);

Expand Down Expand Up @@ -413,7 +413,8 @@ void l2cap_chan_close(struct l2cap_chan *chan, int reason)
struct l2cap_conn *conn = chan->conn;
struct sock *sk = chan->sk;

BT_DBG("chan %p state %d socket %p", chan, chan->state, sk->sk_socket);
BT_DBG("chan %p state %s sk %p", chan,
state_to_string(chan->state), sk);

switch (chan->state) {
case BT_LISTEN:
Expand Down
2 changes: 1 addition & 1 deletion net/bluetooth/l2cap_sock.c
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,7 @@ static void l2cap_sock_kill(struct sock *sk)
if (!sock_flag(sk, SOCK_ZAPPED) || sk->sk_socket)
return;

BT_DBG("sk %p state %d", sk, sk->sk_state);
BT_DBG("sk %p state %s", sk, state_to_string(sk->sk_state));

/* Kill poor orphan */

Expand Down

0 comments on commit e05dcc3

Please sign in to comment.