Commit e05dcc32 authored by Andrei Emeltchenko's avatar Andrei Emeltchenko Committed by Johan Hedberg
Browse files

Bluetooth: Use symbolic names for state in debug 



Use state_to_string function in debug statements.

Signed-off-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 20d1803a

include/net/bluetooth/l2cap.h

+2 −1
Original line number Diff line number Diff line
@@ -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);

net/bluetooth/hci_conn.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

net/bluetooth/l2cap_core.c

+3 −2
Original line number Diff line number Diff line
@@ -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);
@@ -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:

net/bluetooth/l2cap_sock.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */