summaryrefslogtreecommitdiff
path: root/net/bluetooth/rfcomm
diff options
context:
space:
mode:
Diffstat (limited to 'net/bluetooth/rfcomm')
-rw-r--r--net/bluetooth/rfcomm/core.c130
-rw-r--r--net/bluetooth/rfcomm/sock.c47
-rw-r--r--net/bluetooth/rfcomm/tty.c48
3 files changed, 113 insertions, 112 deletions
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c
index 29709fbfd1f5..6a83e1b14575 100644
--- a/net/bluetooth/rfcomm/core.c
+++ b/net/bluetooth/rfcomm/core.c
@@ -184,13 +184,13 @@ static inline int __check_fcs(u8 *data, int type, u8 fcs)
/* ---- L2CAP callbacks ---- */
static void rfcomm_l2state_change(struct sock *sk)
{
- BT_DBG("%p state %d", sk, sk->sk_state);
+ BT_DBG("%pK state %d", sk, sk->sk_state);
rfcomm_schedule();
}
static void rfcomm_l2data_ready(struct sock *sk)
{
- BT_DBG("%p", sk);
+ BT_DBG("%pK", sk);
rfcomm_schedule();
}
@@ -237,7 +237,7 @@ static void rfcomm_session_timeout(unsigned long arg)
{
struct rfcomm_session *s = (void *) arg;
- BT_DBG("session %p state %ld", s, s->state);
+ BT_DBG("session %pK state %ld", s, s->state);
set_bit(RFCOMM_TIMED_OUT, &s->flags);
rfcomm_schedule();
@@ -245,14 +245,14 @@ static void rfcomm_session_timeout(unsigned long arg)
static void rfcomm_session_set_timer(struct rfcomm_session *s, long timeout)
{
- BT_DBG("session %p state %ld timeout %ld", s, s->state, timeout);
+ BT_DBG("session %pK state %ld timeout %ld", s, s->state, timeout);
mod_timer(&s->timer, jiffies + timeout);
}
static void rfcomm_session_clear_timer(struct rfcomm_session *s)
{
- BT_DBG("session %p state %ld", s, s->state);
+ BT_DBG("session %pK state %ld", s, s->state);
del_timer_sync(&s->timer);
}
@@ -262,7 +262,7 @@ static void rfcomm_dlc_timeout(unsigned long arg)
{
struct rfcomm_dlc *d = (void *) arg;
- BT_DBG("dlc %p state %ld", d, d->state);
+ BT_DBG("dlc %pK state %ld", d, d->state);
set_bit(RFCOMM_TIMED_OUT, &d->flags);
rfcomm_dlc_put(d);
@@ -271,7 +271,7 @@ static void rfcomm_dlc_timeout(unsigned long arg)
static void rfcomm_dlc_set_timer(struct rfcomm_dlc *d, long timeout)
{
- BT_DBG("dlc %p state %ld timeout %ld", d, d->state, timeout);
+ BT_DBG("dlc %pK state %ld timeout %ld", d, d->state, timeout);
if (!mod_timer(&d->timer, jiffies + timeout))
rfcomm_dlc_hold(d);
@@ -279,7 +279,7 @@ static void rfcomm_dlc_set_timer(struct rfcomm_dlc *d, long timeout)
static void rfcomm_dlc_clear_timer(struct rfcomm_dlc *d)
{
- BT_DBG("dlc %p state %ld", d, d->state);
+ BT_DBG("dlc %pK state %ld", d, d->state);
if (del_timer(&d->timer))
rfcomm_dlc_put(d);
@@ -287,7 +287,7 @@ static void rfcomm_dlc_clear_timer(struct rfcomm_dlc *d)
static void rfcomm_dlc_clear_state(struct rfcomm_dlc *d)
{
- BT_DBG("%p", d);
+ BT_DBG("%pK", d);
d->state = BT_OPEN;
d->flags = 0;
@@ -315,14 +315,14 @@ struct rfcomm_dlc *rfcomm_dlc_alloc(gfp_t prio)
rfcomm_dlc_clear_state(d);
- BT_DBG("%p", d);
+ BT_DBG("%pK", d);
return d;
}
void rfcomm_dlc_free(struct rfcomm_dlc *d)
{
- BT_DBG("%p", d);
+ BT_DBG("%pK", d);
skb_queue_purge(&d->tx_queue);
kfree(d);
@@ -330,7 +330,7 @@ void rfcomm_dlc_free(struct rfcomm_dlc *d)
static void rfcomm_dlc_link(struct rfcomm_session *s, struct rfcomm_dlc *d)
{
- BT_DBG("dlc %p session %p", d, s);
+ BT_DBG("dlc %pK session %pK", d, s);
rfcomm_session_clear_timer(s);
rfcomm_dlc_hold(d);
@@ -342,7 +342,7 @@ static void rfcomm_dlc_unlink(struct rfcomm_dlc *d)
{
struct rfcomm_session *s = d->session;
- BT_DBG("dlc %p refcnt %d session %p", d, atomic_read(&d->refcnt), s);
+ BT_DBG("dlc %pK refcnt %d session %pK", d, atomic_read(&d->refcnt), s);
list_del(&d->list);
d->session = NULL;
@@ -374,7 +374,7 @@ static int __rfcomm_dlc_open(struct rfcomm_dlc *d, bdaddr_t *src, bdaddr_t *dst,
int err = 0;
u8 dlci;
- BT_DBG("dlc %p state %ld %pMR -> %pMR channel %d",
+ BT_DBG("dlc %pK state %ld %pMR -> %pMR channel %d",
d, d->state, src, dst, channel);
if (rfcomm_check_channel(channel))
@@ -454,8 +454,8 @@ static int __rfcomm_dlc_close(struct rfcomm_dlc *d, int err)
if (!s)
return 0;
- BT_DBG("dlc %p state %ld dlci %d err %d session %p",
- d, d->state, d->dlci, err, s);
+ BT_DBG("dlc %pK state %ld dlci %d err %d session %pK",
+ d, d->state, d->dlci, err, s);
switch (d->state) {
case BT_CONNECT:
@@ -505,7 +505,7 @@ int rfcomm_dlc_close(struct rfcomm_dlc *d, int err)
struct rfcomm_dlc *d_list;
struct rfcomm_session *s, *s_list;
- BT_DBG("dlc %p state %ld dlci %d err %d", d, d->state, d->dlci, err);
+ BT_DBG("dlc %pK state %ld dlci %d err %d", d, d->state, d->dlci, err);
rfcomm_lock();
@@ -559,7 +559,7 @@ int rfcomm_dlc_send(struct rfcomm_dlc *d, struct sk_buff *skb)
if (d->state != BT_CONNECTED)
return -ENOTCONN;
- BT_DBG("dlc %p mtu %d len %d", d, d->mtu, len);
+ BT_DBG("dlc %pK mtu %d len %d", d, d->mtu, len);
if (len > d->mtu)
return -EINVAL;
@@ -576,7 +576,7 @@ void rfcomm_dlc_send_noerror(struct rfcomm_dlc *d, struct sk_buff *skb)
{
int len = skb->len;
- BT_DBG("dlc %p mtu %d len %d", d, d->mtu, len);
+ BT_DBG("dlc %pK mtu %d len %d", d, d->mtu, len);
rfcomm_make_uih(skb, d->addr);
skb_queue_tail(&d->tx_queue, skb);
@@ -588,7 +588,7 @@ void rfcomm_dlc_send_noerror(struct rfcomm_dlc *d, struct sk_buff *skb)
void __rfcomm_dlc_throttle(struct rfcomm_dlc *d)
{
- BT_DBG("dlc %p state %ld", d, d->state);
+ BT_DBG("dlc %pK state %ld", d, d->state);
if (!d->cfc) {
d->v24_sig |= RFCOMM_V24_FC;
@@ -599,7 +599,7 @@ void __rfcomm_dlc_throttle(struct rfcomm_dlc *d)
void __rfcomm_dlc_unthrottle(struct rfcomm_dlc *d)
{
- BT_DBG("dlc %p state %ld", d, d->state);
+ BT_DBG("dlc %pK state %ld", d, d->state);
if (!d->cfc) {
d->v24_sig &= ~RFCOMM_V24_FC;
@@ -615,8 +615,8 @@ void __rfcomm_dlc_unthrottle(struct rfcomm_dlc *d)
*/
int rfcomm_dlc_set_modem_status(struct rfcomm_dlc *d, u8 v24_sig)
{
- BT_DBG("dlc %p state %ld v24_sig 0x%x",
- d, d->state, v24_sig);
+ BT_DBG("dlc %pK state %ld v24_sig 0x%x",
+ d, d->state, v24_sig);
if (test_bit(RFCOMM_RX_THROTTLED, &d->flags))
v24_sig |= RFCOMM_V24_FC;
@@ -633,8 +633,8 @@ int rfcomm_dlc_set_modem_status(struct rfcomm_dlc *d, u8 v24_sig)
int rfcomm_dlc_get_modem_status(struct rfcomm_dlc *d, u8 *v24_sig)
{
- BT_DBG("dlc %p state %ld v24_sig 0x%x",
- d, d->state, d->v24_sig);
+ BT_DBG("dlc %pK state %ld v24_sig 0x%x",
+ d, d->state, d->v24_sig);
*v24_sig = d->v24_sig;
return 0;
@@ -648,7 +648,7 @@ static struct rfcomm_session *rfcomm_session_add(struct socket *sock, int state)
if (!s)
return NULL;
- BT_DBG("session %p sock %p", s, sock);
+ BT_DBG("session %pK sock %pK", s, sock);
setup_timer(&s->timer, rfcomm_session_timeout, (unsigned long) s);
@@ -676,7 +676,7 @@ static struct rfcomm_session *rfcomm_session_del(struct rfcomm_session *s)
{
int state = s->state;
- BT_DBG("session %p state %ld", s, s->state);
+ BT_DBG("session %pK state %ld", s, s->state);
list_del(&s->list);
@@ -714,7 +714,7 @@ static struct rfcomm_session *rfcomm_session_close(struct rfcomm_session *s,
s->state = BT_CLOSED;
- BT_DBG("session %p state %ld err %d", s, s->state, err);
+ BT_DBG("session %pK state %ld err %d", s, s->state, err);
/* Close all dlcs */
list_for_each_safe(p, n, &s->dlcs) {
@@ -800,7 +800,7 @@ static int rfcomm_send_frame(struct rfcomm_session *s, u8 *data, int len)
struct kvec iv = { data, len };
struct msghdr msg;
- BT_DBG("session %p len %d", s, len);
+ BT_DBG("session %pK len %d", s, len);
memset(&msg, 0, sizeof(msg));
@@ -809,7 +809,7 @@ static int rfcomm_send_frame(struct rfcomm_session *s, u8 *data, int len)
static int rfcomm_send_cmd(struct rfcomm_session *s, struct rfcomm_cmd *cmd)
{
- BT_DBG("%p cmd %u", s, cmd->ctrl);
+ BT_DBG("%pK cmd %u", s, cmd->ctrl);
return rfcomm_send_frame(s, (void *) cmd, sizeof(*cmd));
}
@@ -818,7 +818,7 @@ static int rfcomm_send_sabm(struct rfcomm_session *s, u8 dlci)
{
struct rfcomm_cmd cmd;
- BT_DBG("%p dlci %d", s, dlci);
+ BT_DBG("%pK dlci %d", s, dlci);
cmd.addr = __addr(s->initiator, dlci);
cmd.ctrl = __ctrl(RFCOMM_SABM, 1);
@@ -832,7 +832,7 @@ static int rfcomm_send_ua(struct rfcomm_session *s, u8 dlci)
{
struct rfcomm_cmd cmd;
- BT_DBG("%p dlci %d", s, dlci);
+ BT_DBG("%pK dlci %d", s, dlci);
cmd.addr = __addr(!s->initiator, dlci);
cmd.ctrl = __ctrl(RFCOMM_UA, 1);
@@ -846,7 +846,7 @@ static int rfcomm_send_disc(struct rfcomm_session *s, u8 dlci)
{
struct rfcomm_cmd cmd;
- BT_DBG("%p dlci %d", s, dlci);
+ BT_DBG("%pK dlci %d", s, dlci);
cmd.addr = __addr(s->initiator, dlci);
cmd.ctrl = __ctrl(RFCOMM_DISC, 1);
@@ -861,7 +861,7 @@ static int rfcomm_queue_disc(struct rfcomm_dlc *d)
struct rfcomm_cmd *cmd;
struct sk_buff *skb;
- BT_DBG("dlc %p dlci %d", d, d->dlci);
+ BT_DBG("dlc %pK dlci %d", d, d->dlci);
skb = alloc_skb(sizeof(*cmd), GFP_KERNEL);
if (!skb)
@@ -882,7 +882,7 @@ static int rfcomm_send_dm(struct rfcomm_session *s, u8 dlci)
{
struct rfcomm_cmd cmd;
- BT_DBG("%p dlci %d", s, dlci);
+ BT_DBG("%pK dlci %d", s, dlci);
cmd.addr = __addr(!s->initiator, dlci);
cmd.ctrl = __ctrl(RFCOMM_DM, 1);
@@ -898,7 +898,7 @@ static int rfcomm_send_nsc(struct rfcomm_session *s, int cr, u8 type)
struct rfcomm_mcc *mcc;
u8 buf[16], *ptr = buf;
- BT_DBG("%p cr %d type %d", s, cr, type);
+ BT_DBG("%pK cr %d type %d", s, cr, type);
hdr = (void *) ptr; ptr += sizeof(*hdr);
hdr->addr = __addr(s->initiator, 0);
@@ -924,7 +924,7 @@ static int rfcomm_send_pn(struct rfcomm_session *s, int cr, struct rfcomm_dlc *d
struct rfcomm_pn *pn;
u8 buf[16], *ptr = buf;
- BT_DBG("%p cr %d dlci %d mtu %d", s, cr, d->dlci, d->mtu);
+ BT_DBG("%pK cr %d dlci %d mtu %d", s, cr, d->dlci, d->mtu);
hdr = (void *) ptr; ptr += sizeof(*hdr);
hdr->addr = __addr(s->initiator, 0);
@@ -969,10 +969,9 @@ int rfcomm_send_rpn(struct rfcomm_session *s, int cr, u8 dlci,
struct rfcomm_rpn *rpn;
u8 buf[16], *ptr = buf;
- BT_DBG("%p cr %d dlci %d bit_r 0x%x data_b 0x%x stop_b 0x%x parity 0x%x"
- " flwc_s 0x%x xon_c 0x%x xoff_c 0x%x p_mask 0x%x",
- s, cr, dlci, bit_rate, data_bits, stop_bits, parity,
- flow_ctrl_settings, xon_char, xoff_char, param_mask);
+ BT_DBG("%pK cr %d dlci %d bit_r 0x%x data_b 0x%x stop_b 0x%x parity 0x%x flwc_s 0x%x xon_c 0x%x xoff_c 0x%x p_mask 0x%x",
+ s, cr, dlci, bit_rate, data_bits, stop_bits, parity,
+ flow_ctrl_settings, xon_char, xoff_char, param_mask);
hdr = (void *) ptr; ptr += sizeof(*hdr);
hdr->addr = __addr(s->initiator, 0);
@@ -1004,7 +1003,7 @@ static int rfcomm_send_rls(struct rfcomm_session *s, int cr, u8 dlci, u8 status)
struct rfcomm_rls *rls;
u8 buf[16], *ptr = buf;
- BT_DBG("%p cr %d status 0x%x", s, cr, status);
+ BT_DBG("%pK cr %d status 0x%x", s, cr, status);
hdr = (void *) ptr; ptr += sizeof(*hdr);
hdr->addr = __addr(s->initiator, 0);
@@ -1031,7 +1030,7 @@ static int rfcomm_send_msc(struct rfcomm_session *s, int cr, u8 dlci, u8 v24_sig
struct rfcomm_msc *msc;
u8 buf[16], *ptr = buf;
- BT_DBG("%p cr %d v24 0x%x", s, cr, v24_sig);
+ BT_DBG("%pK cr %d v24 0x%x", s, cr, v24_sig);
hdr = (void *) ptr; ptr += sizeof(*hdr);
hdr->addr = __addr(s->initiator, 0);
@@ -1057,7 +1056,7 @@ static int rfcomm_send_fcoff(struct rfcomm_session *s, int cr)
struct rfcomm_mcc *mcc;
u8 buf[16], *ptr = buf;
- BT_DBG("%p cr %d", s, cr);
+ BT_DBG("%pK cr %d", s, cr);
hdr = (void *) ptr; ptr += sizeof(*hdr);
hdr->addr = __addr(s->initiator, 0);
@@ -1079,7 +1078,7 @@ static int rfcomm_send_fcon(struct rfcomm_session *s, int cr)
struct rfcomm_mcc *mcc;
u8 buf[16], *ptr = buf;
- BT_DBG("%p cr %d", s, cr);
+ BT_DBG("%pK cr %d", s, cr);
hdr = (void *) ptr; ptr += sizeof(*hdr);
hdr->addr = __addr(s->initiator, 0);
@@ -1105,7 +1104,7 @@ static int rfcomm_send_test(struct rfcomm_session *s, int cr, u8 *pattern, int l
if (len > 125)
return -EINVAL;
- BT_DBG("%p cr %d", s, cr);
+ BT_DBG("%pK cr %d", s, cr);
hdr[0] = __addr(s->initiator, 0);
hdr[1] = __ctrl(RFCOMM_UIH, 0);
@@ -1132,7 +1131,7 @@ static int rfcomm_send_credits(struct rfcomm_session *s, u8 addr, u8 credits)
struct rfcomm_hdr *hdr;
u8 buf[16], *ptr = buf;
- BT_DBG("%p addr %d credits %d", s, addr, credits);
+ BT_DBG("%pK addr %d credits %d", s, addr, credits);
hdr = (void *) ptr; ptr += sizeof(*hdr);
hdr->addr = addr;
@@ -1169,7 +1168,7 @@ static void rfcomm_make_uih(struct sk_buff *skb, u8 addr)
/* ---- RFCOMM frame reception ---- */
static struct rfcomm_session *rfcomm_recv_ua(struct rfcomm_session *s, u8 dlci)
{
- BT_DBG("session %p state %ld dlci %d", s, s->state, dlci);
+ BT_DBG("session %pK state %ld dlci %d", s, s->state, dlci);
if (dlci) {
/* Data channel */
@@ -1223,7 +1222,7 @@ static struct rfcomm_session *rfcomm_recv_dm(struct rfcomm_session *s, u8 dlci)
{
int err = 0;
- BT_DBG("session %p state %ld dlci %d", s, s->state, dlci);
+ BT_DBG("session %pK state %ld dlci %d", s, s->state, dlci);
if (dlci) {
/* Data DLC */
@@ -1253,7 +1252,7 @@ static struct rfcomm_session *rfcomm_recv_disc(struct rfcomm_session *s,
{
int err = 0;
- BT_DBG("session %p state %ld dlci %d", s, s->state, dlci);
+ BT_DBG("session %pK state %ld dlci %d", s, s->state, dlci);
if (dlci) {
struct rfcomm_dlc *d = rfcomm_dlc_get(s, dlci);
@@ -1288,7 +1287,7 @@ void rfcomm_dlc_accept(struct rfcomm_dlc *d)
struct sock *sk = d->session->sock->sk;
struct l2cap_conn *conn = l2cap_pi(sk)->chan->conn;
- BT_DBG("dlc %p", d);
+ BT_DBG("dlc %pK", d);
rfcomm_send_ua(d->session, d->dlci);
@@ -1329,7 +1328,7 @@ static int rfcomm_recv_sabm(struct rfcomm_session *s, u8 dlci)
struct rfcomm_dlc *d;
u8 channel;
- BT_DBG("session %p state %ld dlci %d", s, s->state, dlci);
+ BT_DBG("session %pK state %ld dlci %d", s, s->state, dlci);
if (!dlci) {
rfcomm_send_ua(s, 0);
@@ -1370,8 +1369,8 @@ static int rfcomm_apply_pn(struct rfcomm_dlc *d, int cr, struct rfcomm_pn *pn)
{
struct rfcomm_session *s = d->session;
- BT_DBG("dlc %p state %ld dlci %d mtu %d fc 0x%x credits %d",
- d, d->state, d->dlci, pn->mtu, pn->flow_ctrl, pn->credits);
+ BT_DBG("dlc %pK state %ld dlci %d mtu %d fc 0x%x credits %d",
+ d, d->state, d->dlci, pn->mtu, pn->flow_ctrl, pn->credits);
if ((pn->flow_ctrl == 0xf0 && s->cfc != RFCOMM_CFC_DISABLED) ||
pn->flow_ctrl == 0xe0) {
@@ -1401,7 +1400,7 @@ static int rfcomm_recv_pn(struct rfcomm_session *s, int cr, struct sk_buff *skb)
struct rfcomm_dlc *d;
u8 dlci = pn->dlci;
- BT_DBG("session %p state %ld dlci %d", s, s->state, dlci);
+ BT_DBG("session %pK state %ld dlci %d", s, s->state, dlci);
if (!dlci)
return 0;
@@ -1617,7 +1616,7 @@ static int rfcomm_recv_mcc(struct rfcomm_session *s, struct sk_buff *skb)
type = __get_mcc_type(mcc->type);
len = __get_mcc_len(mcc->len);
- BT_DBG("%p type 0x%x cr %d", s, type, cr);
+ BT_DBG("%pK type 0x%x cr %d", s, type, cr);
skb_pull(skb, 2);
@@ -1672,7 +1671,7 @@ static int rfcomm_recv_data(struct rfcomm_session *s, u8 dlci, int pf, struct sk
{
struct rfcomm_dlc *d;
- BT_DBG("session %p state %ld dlci %d pf %d", s, s->state, dlci, pf);
+ BT_DBG("session %pK state %ld dlci %d pf %d", s, s->state, dlci, pf);
d = rfcomm_dlc_get(s, dlci);
if (!d) {
@@ -1774,7 +1773,7 @@ static void rfcomm_process_connect(struct rfcomm_session *s)
struct rfcomm_dlc *d;
struct list_head *p, *n;
- BT_DBG("session %p state %ld", s, s->state);
+ BT_DBG("session %pK state %ld", s, s->state);
list_for_each_safe(p, n, &s->dlcs) {
d = list_entry(p, struct rfcomm_dlc, list);
@@ -1798,8 +1797,8 @@ static int rfcomm_process_tx(struct rfcomm_dlc *d)
struct sk_buff *skb;
int err;
- BT_DBG("dlc %p state %ld cfc %d rx_credits %d tx_credits %d",
- d, d->state, d->cfc, d->rx_credits, d->tx_credits);
+ BT_DBG("dlc %pK state %ld cfc %d rx_credits %d tx_credits %d",
+ d, d->state, d->cfc, d->rx_credits, d->tx_credits);
/* Send pending MSC */
if (test_and_clear_bit(RFCOMM_MSC_PENDING, &d->flags))
@@ -1846,7 +1845,7 @@ static void rfcomm_process_dlcs(struct rfcomm_session *s)
struct rfcomm_dlc *d;
struct list_head *p, *n;
- BT_DBG("session %p state %ld", s, s->state);
+ BT_DBG("session %pK state %ld", s, s->state);
list_for_each_safe(p, n, &s->dlcs) {
d = list_entry(p, struct rfcomm_dlc, list);
@@ -1907,7 +1906,8 @@ static struct rfcomm_session *rfcomm_process_rx(struct rfcomm_session *s)
struct sock *sk = sock->sk;
struct sk_buff *skb;
- BT_DBG("session %p state %ld qlen %d", s, s->state, skb_queue_len(&sk->sk_receive_queue));
+ BT_DBG("session %pK state %ld qlen %d", s, s->state,
+ skb_queue_len(&sk->sk_receive_queue));
/* Get data directly from socket receive queue without copying it. */
while ((skb = skb_dequeue(&sk->sk_receive_queue))) {
@@ -1937,7 +1937,7 @@ static void rfcomm_accept_connection(struct rfcomm_session *s)
if (list_empty(&bt_sk(sock->sk)->accept_q))
return;
- BT_DBG("session %p", s);
+ BT_DBG("session %pK", s);
err = kernel_accept(sock, &nsock, O_NONBLOCK);
if (err < 0)
@@ -1963,7 +1963,7 @@ static struct rfcomm_session *rfcomm_check_connection(struct rfcomm_session *s)
{
struct sock *sk = s->sock->sk;
- BT_DBG("%p state %ld", s, s->state);
+ BT_DBG("%pK state %ld", s, s->state);
switch (sk->sk_state) {
case BT_CONNECTED:
@@ -2116,7 +2116,7 @@ static void rfcomm_security_cfm(struct hci_conn *conn, u8 status, u8 encrypt)
struct rfcomm_dlc *d;
struct list_head *p, *n;
- BT_DBG("conn %p status 0x%02x encrypt 0x%02x", conn, status, encrypt);
+ BT_DBG("conn %pK status 0x%02x encrypt 0x%02x", conn, status, encrypt);
s = rfcomm_session_get(&conn->hdev->bdaddr, &conn->dst);
if (!s)
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
index 7511df72347f..e8922de3c725 100644
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
@@ -68,7 +68,7 @@ static void rfcomm_sk_state_change(struct rfcomm_dlc *d, int err)
if (!sk)
return;
- BT_DBG("dlc %p state %ld err %d", d, d->state, err);
+ BT_DBG("dlc %pK state %ld err %d", d, d->state, err);
local_irq_save(flags);
bh_lock_sock(sk);
@@ -156,7 +156,7 @@ static void rfcomm_sock_destruct(struct sock *sk)
{
struct rfcomm_dlc *d = rfcomm_pi(sk)->dlc;
- BT_DBG("sk %p dlc %p", sk, d);
+ BT_DBG("sk %pK dlc %pK", sk, d);
skb_queue_purge(&sk->sk_receive_queue);
skb_queue_purge(&sk->sk_write_queue);
@@ -176,7 +176,7 @@ static void rfcomm_sock_cleanup_listen(struct sock *parent)
{
struct sock *sk;
- BT_DBG("parent %p", parent);
+ BT_DBG("parent %pK", parent);
/* Close not yet accepted dlcs */
while ((sk = bt_accept_dequeue(parent, NULL))) {
@@ -196,7 +196,8 @@ static void rfcomm_sock_kill(struct sock *sk)
if (!sock_flag(sk, SOCK_ZAPPED) || sk->sk_socket)
return;
- BT_DBG("sk %p state %d refcnt %d", sk, sk->sk_state, atomic_read(&sk->sk_refcnt));
+ BT_DBG("sk %pK state %d refcnt %d", sk, sk->sk_state,
+ atomic_read(&sk->sk_refcnt));
/* Kill poor orphan */
bt_sock_unlink(&rfcomm_sk_list, sk);
@@ -208,7 +209,7 @@ static void __rfcomm_sock_close(struct sock *sk)
{
struct rfcomm_dlc *d = rfcomm_pi(sk)->dlc;
- BT_DBG("sk %p state %d socket %p", sk, sk->sk_state, sk->sk_socket);
+ BT_DBG("sk %pK state %d socket %pK", sk, sk->sk_state, sk->sk_socket);
switch (sk->sk_state) {
case BT_LISTEN:
@@ -241,7 +242,7 @@ static void rfcomm_sock_init(struct sock *sk, struct sock *parent)
{
struct rfcomm_pinfo *pi = rfcomm_pi(sk);
- BT_DBG("sk %p", sk);
+ BT_DBG("sk %pK", sk);
if (parent) {
sk->sk_type = parent->sk_type;
@@ -306,7 +307,7 @@ static struct sock *rfcomm_sock_alloc(struct net *net, struct socket *sock, int
bt_sock_link(&rfcomm_sk_list, sk);
- BT_DBG("sk %p", sk);
+ BT_DBG("sk %pK", sk);
return sk;
}
@@ -315,7 +316,7 @@ static int rfcomm_sock_create(struct net *net, struct socket *sock,
{
struct sock *sk;
- BT_DBG("sock %p", sock);
+ BT_DBG("sock %pK", sock);
sock->state = SS_UNCONNECTED;
@@ -345,7 +346,7 @@ static int rfcomm_sock_bind(struct socket *sock, struct sockaddr *addr, int addr
len = min_t(unsigned int, sizeof(sa), addr_len);
memcpy(&sa, addr, len);
- BT_DBG("sk %p %pMR", sk, &sa.rc_bdaddr);
+ BT_DBG("sk %pK %pMR", sk, &sa.rc_bdaddr);
lock_sock(sk);
@@ -385,7 +386,7 @@ static int rfcomm_sock_connect(struct socket *sock, struct sockaddr *addr, int a
struct rfcomm_dlc *d = rfcomm_pi(sk)->dlc;
int err = 0;
- BT_DBG("sk %p", sk);
+ BT_DBG("sk %pK", sk);
if (alen < sizeof(struct sockaddr_rc) ||
addr->sa_family != AF_BLUETOOTH)
@@ -426,7 +427,7 @@ static int rfcomm_sock_listen(struct socket *sock, int backlog)
struct sock *sk = sock->sk;
int err = 0;
- BT_DBG("sk %p backlog %d", sk, backlog);
+ BT_DBG("sk %pK backlog %d", sk, backlog);
lock_sock(sk);
@@ -486,7 +487,7 @@ static int rfcomm_sock_accept(struct socket *sock, struct socket *newsock, int f
timeo = sock_rcvtimeo(sk, flags & O_NONBLOCK);
- BT_DBG("sk %p timeo %ld", sk, timeo);
+ BT_DBG("sk %pK timeo %ld", sk, timeo);
/* Wait for an incoming connection. (wake-one). */
add_wait_queue_exclusive(sk_sleep(sk), &wait);
@@ -523,7 +524,7 @@ static int rfcomm_sock_accept(struct socket *sock, struct socket *newsock, int f
newsock->state = SS_CONNECTED;
- BT_DBG("new socket %p", nsk);
+ BT_DBG("new socket %pK", nsk);
done:
release_sock(sk);
@@ -535,7 +536,7 @@ static int rfcomm_sock_getname(struct socket *sock, struct sockaddr *addr, int *
struct sockaddr_rc *sa = (struct sockaddr_rc *) addr;
struct sock *sk = sock->sk;
- BT_DBG("sock %p, sk %p", sock, sk);
+ BT_DBG("sock %pK, sk %pK", sock, sk);
if (peer && sk->sk_state != BT_CONNECTED &&
sk->sk_state != BT_CONNECT && sk->sk_state != BT_CONNECT2)
@@ -570,7 +571,7 @@ static int rfcomm_sock_sendmsg(struct socket *sock, struct msghdr *msg,
if (sk->sk_shutdown & SEND_SHUTDOWN)
return -EPIPE;
- BT_DBG("sock %p, sk %p", sock, sk);
+ BT_DBG("sock %pK, sk %pK", sock, sk);
lock_sock(sk);
@@ -650,7 +651,7 @@ static int rfcomm_sock_setsockopt_old(struct socket *sock, int optname, char __u
int err = 0;
u32 opt;
- BT_DBG("sk %p", sk);
+ BT_DBG("sk %pK", sk);
lock_sock(sk);
@@ -693,7 +694,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
size_t len;
u32 opt;
- BT_DBG("sk %p", sk);
+ BT_DBG("sk %pK", sk);
if (level == SOL_RFCOMM)
return rfcomm_sock_setsockopt_old(sock, optname, optval, optlen);
@@ -762,7 +763,7 @@ static int rfcomm_sock_getsockopt_old(struct socket *sock, int optname, char __u
int len, err = 0;
u32 opt;
- BT_DBG("sk %p", sk);
+ BT_DBG("sk %pK", sk);
if (get_user(len, optlen))
return -EFAULT;
@@ -834,7 +835,7 @@ static int rfcomm_sock_getsockopt(struct socket *sock, int level, int optname, c
struct bt_security sec;
int len, err = 0;
- BT_DBG("sk %p", sk);
+ BT_DBG("sk %pK", sk);
if (level == SOL_RFCOMM)
return rfcomm_sock_getsockopt_old(sock, optname, optval, optlen);
@@ -889,7 +890,7 @@ static int rfcomm_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned lon
struct sock *sk __maybe_unused = sock->sk;
int err;
- BT_DBG("sk %p cmd %x arg %lx", sk, cmd, arg);
+ BT_DBG("sk %pK cmd %x arg %lx", sk, cmd, arg);
err = bt_sock_ioctl(sock, cmd, arg);
@@ -911,7 +912,7 @@ static int rfcomm_sock_shutdown(struct socket *sock, int how)
struct sock *sk = sock->sk;
int err = 0;
- BT_DBG("sock %p, sk %p", sock, sk);
+ BT_DBG("sock %pK, sk %pK", sock, sk);
if (!sk)
return 0;
@@ -934,7 +935,7 @@ static int rfcomm_sock_release(struct socket *sock)
struct sock *sk = sock->sk;
int err;
- BT_DBG("sock %p, sk %p", sock, sk);
+ BT_DBG("sock %pK, sk %pK", sock, sk);
if (!sk)
return 0;
@@ -956,7 +957,7 @@ int rfcomm_connect_ind(struct rfcomm_session *s, u8 channel, struct rfcomm_dlc *
bdaddr_t src, dst;
int result = 0;
- BT_DBG("session %p channel %d", s, channel);
+ BT_DBG("session %pK channel %d", s, channel);
rfcomm_session_getaddr(s, &src, &dst);
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
index 939fbf7b352d..d3f29174caa5 100644
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
@@ -83,7 +83,7 @@ static void rfcomm_dev_destruct(struct tty_port *port)
struct rfcomm_dev *dev = container_of(port, struct rfcomm_dev, port);
struct rfcomm_dlc *dlc = dev->dlc;
- BT_DBG("dev %p dlc %p", dev, dlc);
+ BT_DBG("dev %pK dlc %pK", dev, dlc);
rfcomm_dlc_lock(dlc);
/* Detach DLC if it's owned by this dev */
@@ -396,7 +396,7 @@ static int __rfcomm_create_dev(struct sock *sk, void __user *arg)
if (copy_from_user(&req, arg, sizeof(req)))
return -EFAULT;
- BT_DBG("sk %p dev_id %d flags 0x%x", sk, req.dev_id, req.flags);
+ BT_DBG("sk %pK dev_id %d flags 0x%x", sk, req.dev_id, req.flags);
if (req.flags != NOCAP_FLAGS && !capable(CAP_NET_ADMIN))
return -EPERM;
@@ -579,7 +579,7 @@ static int rfcomm_get_dev_info(void __user *arg)
int rfcomm_dev_ioctl(struct sock *sk, unsigned int cmd, void __user *arg)
{
- BT_DBG("cmd %d arg %p", cmd, arg);
+ BT_DBG("cmd %d arg %pK", cmd, arg);
switch (cmd) {
case RFCOMMCREATEDEV:
@@ -613,7 +613,7 @@ static void rfcomm_dev_data_ready(struct rfcomm_dlc *dlc, struct sk_buff *skb)
return;
}
- BT_DBG("dlc %p len %d", dlc, skb->len);
+ BT_DBG("dlc %pK len %d", dlc, skb->len);
tty_insert_flip_string(&dev->port, skb->data, skb->len);
tty_flip_buffer_push(&dev->port);
@@ -627,7 +627,7 @@ static void rfcomm_dev_state_change(struct rfcomm_dlc *dlc, int err)
if (!dev)
return;
- BT_DBG("dlc %p dev %p err %d", dlc, dev, err);
+ BT_DBG("dlc %pK dev %pK err %d", dlc, dev, err);
dev->err = err;
if (dlc->state == BT_CONNECTED) {
@@ -644,7 +644,7 @@ static void rfcomm_dev_modem_status(struct rfcomm_dlc *dlc, u8 v24_sig)
if (!dev)
return;
- BT_DBG("dlc %p dev %p v24_sig 0x%02x", dlc, dev, v24_sig);
+ BT_DBG("dlc %pK dev %pK v24_sig 0x%02x", dlc, dev, v24_sig);
if ((dev->modem_status & TIOCM_CD) && !(v24_sig & RFCOMM_V24_DV))
tty_port_tty_hangup(&dev->port, true);
@@ -662,7 +662,7 @@ static void rfcomm_tty_copy_pending(struct rfcomm_dev *dev)
struct sk_buff *skb;
int inserted = 0;
- BT_DBG("dev %p", dev);
+ BT_DBG("dev %pK", dev);
rfcomm_dlc_lock(dev->dlc);
@@ -747,9 +747,9 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
struct rfcomm_dev *dev = tty->driver_data;
int err;
- BT_DBG("tty %p id %d", tty, tty->index);
+ BT_DBG("tty %pK id %d", tty, tty->index);
- BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst,
+ BT_DBG("dev %pK dst %pMR channel %d opened %d", dev, &dev->dst,
dev->channel, dev->port.count);
err = tty_port_open(&dev->port, tty, filp);
@@ -772,8 +772,8 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
{
struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
- BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
- dev->port.count);
+ BT_DBG("tty %pK dev %pK dlc %pK opened %d", tty, dev, dev->dlc,
+ dev->port.count);
tty_port_close(&dev->port, tty, filp);
}
@@ -785,7 +785,7 @@ static int rfcomm_tty_write(struct tty_struct *tty, const unsigned char *buf, in
struct sk_buff *skb;
int sent = 0, size;
- BT_DBG("tty %p count %d", tty, count);
+ BT_DBG("tty %pK count %d", tty, count);
while (count) {
size = min_t(uint, count, dlc->mtu);
@@ -815,14 +815,14 @@ static int rfcomm_tty_write_room(struct tty_struct *tty)
if (dev && dev->dlc)
room = rfcomm_room(dev);
- BT_DBG("tty %p room %d", tty, room);
+ BT_DBG("tty %pK room %d", tty, room);
return room;
}
static int rfcomm_tty_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg)
{
- BT_DBG("tty %p cmd 0x%02x", tty, cmd);
+ BT_DBG("tty %pK cmd 0x%02x", tty, cmd);
switch (cmd) {
case TCGETS:
@@ -876,7 +876,7 @@ static void rfcomm_tty_set_termios(struct tty_struct *tty, struct ktermios *old)
struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
- BT_DBG("tty %p termios %p", tty, old);
+ BT_DBG("tty %pK termios %pK", tty, old);
if (!dev || !dev->dlc || !dev->dlc->session)
return;
@@ -1008,7 +1008,7 @@ static void rfcomm_tty_throttle(struct tty_struct *tty)
{
struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
- BT_DBG("tty %p dev %p", tty, dev);
+ BT_DBG("tty %pK dev %pK", tty, dev);
rfcomm_dlc_throttle(dev->dlc);
}
@@ -1017,7 +1017,7 @@ static void rfcomm_tty_unthrottle(struct tty_struct *tty)
{
struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
- BT_DBG("tty %p dev %p", tty, dev);
+ BT_DBG("tty %pK dev %pK", tty, dev);
rfcomm_dlc_unthrottle(dev->dlc);
}
@@ -1026,7 +1026,7 @@ static int rfcomm_tty_chars_in_buffer(struct tty_struct *tty)
{
struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
- BT_DBG("tty %p dev %p", tty, dev);
+ BT_DBG("tty %pK dev %pK", tty, dev);
if (!dev || !dev->dlc)
return 0;
@@ -1041,7 +1041,7 @@ static void rfcomm_tty_flush_buffer(struct tty_struct *tty)
{
struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
- BT_DBG("tty %p dev %p", tty, dev);
+ BT_DBG("tty %pK dev %pK", tty, dev);
if (!dev || !dev->dlc)
return;
@@ -1052,19 +1052,19 @@ static void rfcomm_tty_flush_buffer(struct tty_struct *tty)
static void rfcomm_tty_send_xchar(struct tty_struct *tty, char ch)
{
- BT_DBG("tty %p ch %c", tty, ch);
+ BT_DBG("tty %pK ch %c", tty, ch);
}
static void rfcomm_tty_wait_until_sent(struct tty_struct *tty, int timeout)
{
- BT_DBG("tty %p timeout %d", tty, timeout);
+ BT_DBG("tty %pK timeout %d", tty, timeout);
}
static void rfcomm_tty_hangup(struct tty_struct *tty)
{
struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
- BT_DBG("tty %p dev %p", tty, dev);
+ BT_DBG("tty %pK dev %pK", tty, dev);
tty_port_hangup(&dev->port);
}
@@ -1073,7 +1073,7 @@ static int rfcomm_tty_tiocmget(struct tty_struct *tty)
{
struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
- BT_DBG("tty %p dev %p", tty, dev);
+ BT_DBG("tty %pK dev %pK", tty, dev);
return dev->modem_status;
}
@@ -1084,7 +1084,7 @@ static int rfcomm_tty_tiocmset(struct tty_struct *tty, unsigned int set, unsigne
struct rfcomm_dlc *dlc = dev->dlc;
u8 v24_sig;
- BT_DBG("tty %p dev %p set 0x%02x clear 0x%02x", tty, dev, set, clear);
+ BT_DBG("tty %pK dev %pK set 0x%02x clear 0x%02x", tty, dev, set, clear);
rfcomm_dlc_get_modem_status(dlc, &v24_sig);
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-23 14:43:24 +0000