Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Bluetooth: Replace %p with %pK 

The %pK restrictions are used to eliminate exposing kernel addresses.
When kptr_restrict is set to "0" there are no restrictions. When
kptr_restrict is set to "1", kernel pointers printed using the %pK
format specifier will be replaced with 0's unless the user has
CAP_SYSLOG. When kptr_restrict is set to "2", kernel pointers printed
using %pK will be replaced with 0's regardless of privileges.

Change-Id: Iacd8f7b7cdafed3a111507d3da899be9261ff09f
Signed-off-by: Dibyendu Roy <dibyen@codeaurora.org>
This commit is contained in:
Dibyendu Roy 2016-03-23 14:00:19 +05:30
parent ab60ffff6c
commit 1f35f0358d
25 changed files with 400 additions and 396 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/bluetooth/hci_h4.c
View File

@ -67,7 +67,7 @@ static int h4_open(struct hci_uart *hu)
{
struct h4_struct *h4;
BT_DBG("hu %p", hu);
BT_DBG("hu %pK", hu);
h4 = kzalloc(sizeof(*h4), GFP_KERNEL);
if (!h4)
@ -84,7 +84,7 @@ static int h4_flush(struct hci_uart *hu)
{
struct h4_struct *h4 = hu->priv;
BT_DBG("hu %p", hu);
BT_DBG("hu %pK", hu);
skb_queue_purge(&h4->txq);
@ -98,7 +98,7 @@ static int h4_close(struct hci_uart *hu)
hu->priv = NULL;
BT_DBG("hu %p", hu);
BT_DBG("hu %pK", hu);
skb_queue_purge(&h4->txq);
@ -115,7 +115,7 @@ static int h4_enqueue(struct hci_uart *hu, struct sk_buff *skb)
{
struct h4_struct *h4 = hu->priv;
BT_DBG("hu %p skb %p", hu, skb);
BT_DBG("hu %pK skb %pK", hu, skb);
/* Prepend skb with frame type */
memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1);

10
drivers/bluetooth/hci_ldisc.c
View File

@ -200,7 +200,7 @@ int hci_uart_init_ready(struct hci_uart *hu)
/* Initialize device */
static int hci_uart_open(struct hci_dev *hdev)
{
BT_DBG("%s %p", hdev->name, hdev);
BT_DBG("%s %pK", hdev->name, hdev);
/* Nothing to do for UART driver */
@ -215,7 +215,7 @@ static int hci_uart_flush(struct hci_dev *hdev)
struct hci_uart *hu = hci_get_drvdata(hdev);
struct tty_struct *tty = hu->tty;
BT_DBG("hdev %p tty %p", hdev, tty);
BT_DBG("hdev %pK tty %pK", hdev, tty);
if (hu->tx_skb) {
kfree_skb(hu->tx_skb); hu->tx_skb = NULL;
@ -234,7 +234,7 @@ static int hci_uart_flush(struct hci_dev *hdev)
/* Close device */
static int hci_uart_close(struct hci_dev *hdev)
{
BT_DBG("hdev %p", hdev);
BT_DBG("hdev %pK", hdev);
if (!test_and_clear_bit(HCI_RUNNING, &hdev->flags))
return 0;
@ -283,7 +283,7 @@ static int hci_uart_tty_open(struct tty_struct *tty)
{
struct hci_uart *hu;
BT_DBG("tty %p", tty);
BT_DBG("tty %pK", tty);
/* Error if the tty has no write op instead of leaving an exploitable
hole */
@ -326,7 +326,7 @@ static void hci_uart_tty_close(struct tty_struct *tty)
struct hci_uart *hu = (void *)tty->disc_data;
struct hci_dev *hdev;
BT_DBG("tty %p", tty);
BT_DBG("tty %pK", tty);
/* Detach from the tty */
tty->disc_data = NULL;

16
net/bluetooth/af_bluetooth.c
View File

@ -188,7 +188,7 @@ EXPORT_SYMBOL(bt_sock_unlink);
*/
void bt_accept_enqueue(struct sock *parent, struct sock *sk)
{
BT_DBG("parent %p, sk %p", parent, sk);
BT_DBG("parent %pK, sk %pK", parent, sk);
sock_hold(sk);
bt_sk(sk)->parent = parent;
@ -199,7 +199,7 @@ EXPORT_SYMBOL(bt_accept_enqueue);
void bt_accept_unlink(struct sock *sk)
{
BT_DBG("sk %p state %d", sk, sk->sk_state);
BT_DBG("sk %pK state %d", sk, sk->sk_state);
if (!bt_sk(sk)->parent)
return;
@ -218,7 +218,7 @@ struct sock *bt_accept_dequeue(struct sock *parent, struct socket *newsock)
struct list_head *p, *n;
struct sock *sk;
BT_DBG("parent %p", parent);
BT_DBG("parent %pK", parent);
list_for_each_safe(p, n, &bt_sk(parent)->accept_q) {
sk = (struct sock *) list_entry(p, struct bt_sock, accept_q);
@ -251,7 +251,7 @@ int bt_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
size_t copied;
int err;
BT_DBG("sock %p sk %p len %zu", sock, sk, len);
BT_DBG("sock %pK sk %pK len %zu", sock, sk, len);
if (flags & (MSG_OOB))
return -EOPNOTSUPP;
@ -320,7 +320,7 @@ int bt_sock_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
if (flags & MSG_OOB)
return -EOPNOTSUPP;
BT_DBG("sk %p size %zu", sk, size);
BT_DBG("sk %pK size %zu", sk, size);
lock_sock(sk);
@ -436,7 +436,7 @@ unsigned int bt_sock_poll(struct file *file, struct socket *sock,
struct sock *sk = sock->sk;
unsigned int mask = 0;
BT_DBG("sock %p, sk %p", sock, sk);
BT_DBG("sock %pK, sk %pK", sock, sk);
poll_wait(file, sk_sleep(sk), wait);
@ -480,7 +480,7 @@ int bt_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
long amount;
int err;
BT_DBG("sk %p cmd %x arg %lx", sk, cmd, arg);
BT_DBG("sk %pK cmd %x arg %lx", sk, cmd, arg);
switch (cmd) {
case TIOCOUTQ:
@ -526,7 +526,7 @@ int bt_sock_wait_state(struct sock *sk, int state, unsigned long timeo)
DECLARE_WAITQUEUE(wait, current);
int err = 0;
BT_DBG("sk %p", sk);
BT_DBG("sk %pK", sk);
add_wait_queue(sk_sleep(sk), &wait);
set_current_state(TASK_INTERRUPTIBLE);

2
net/bluetooth/bnep/core.c
View File

@ -393,7 +393,7 @@ static int bnep_tx_frame(struct bnep_session *s, struct sk_buff *skb)
int len = 0, il = 0;
u8 type = 0;
BT_DBG("skb %p dev %p type %d", skb, skb->dev, skb->pkt_type);
BT_DBG("skb %pK dev %pK type %d", skb, skb->dev, skb->pkt_type);
if (!skb->dev) {
/* Control frame sent by us */

4
net/bluetooth/bnep/netdev.c
View File

@ -156,7 +156,7 @@ static int bnep_net_proto_filter(struct sk_buff *skb, struct bnep_session *s)
return 0;
}
BT_DBG("BNEP: filtered skb %p, proto 0x%.4x", skb, proto);
BT_DBG("BNEP: filtered skb %pK, proto 0x%.4x", skb, proto);
return 1;
}
#endif
@ -167,7 +167,7 @@ static netdev_tx_t bnep_net_xmit(struct sk_buff *skb,
struct bnep_session *s = netdev_priv(dev);
struct sock *sk = s->sock->sk;
BT_DBG("skb %p, dev %p", skb, dev);
BT_DBG("skb %pK, dev %pK", skb, dev);
#ifdef CONFIG_BT_BNEP_MC_FILTER
if (bnep_net_mc_filter(skb, s)) {

4
net/bluetooth/bnep/sock.c
View File

@ -37,7 +37,7 @@ static int bnep_sock_release(struct socket *sock)
{
struct sock *sk = sock->sk;
BT_DBG("sock %p sk %p", sock, sk);
BT_DBG("sock %pK sk %pK", sock, sk);
if (!sk)
return 0;
@ -190,7 +190,7 @@ static int bnep_sock_create(struct net *net, struct socket *sock, int protocol,
{
struct sock *sk;
BT_DBG("sock %p", sock);
BT_DBG("sock %pK", sock);
if (sock->type != SOCK_RAW)
return -ESOCKTNOSUPPORT;

31
net/bluetooth/cmtp/capi.c
View File

@ -74,7 +74,7 @@ static struct cmtp_application *cmtp_application_add(struct cmtp_session *sessio
{
struct cmtp_application *app = kzalloc(sizeof(*app), GFP_KERNEL);
BT_DBG("session %p application %p appl %d", session, app, appl);
BT_DBG("session %pK application %pK appl %d", session, app, appl);
if (!app)
return NULL;
@ -89,7 +89,7 @@ static struct cmtp_application *cmtp_application_add(struct cmtp_session *sessio
static void cmtp_application_del(struct cmtp_session *session, struct cmtp_application *app)
{
BT_DBG("session %p application %p", session, app);
BT_DBG("session %pK application %pK", session, app);
if (app) {
list_del(&app->list);
@ -137,7 +137,7 @@ static void cmtp_send_capimsg(struct cmtp_session *session, struct sk_buff *skb)
{
struct cmtp_scb *scb = (void *) skb->cb;
BT_DBG("session %p skb %p len %d", session, skb, skb->len);
BT_DBG("session %pK skb %pK len %d", session, skb, skb->len);
scb->id = -1;
scb->data = (CAPIMSG_COMMAND(skb->data) == CAPI_DATA_B3);
@ -154,7 +154,8 @@ static void cmtp_send_interopmsg(struct cmtp_session *session,
struct sk_buff *skb;
unsigned char *s;
BT_DBG("session %p subcmd 0x%02x appl %d msgnum %d", session, subcmd, appl, msgnum);
BT_DBG("session %pK subcmd 0x%02x appl %d msgnum %d",
session, subcmd, appl, msgnum);
skb = alloc_skb(CAPI_MSG_BASELEN + 6 + len, GFP_ATOMIC);
if (!skb) {
@ -190,7 +191,7 @@ static void cmtp_recv_interopmsg(struct cmtp_session *session, struct sk_buff *s
__u16 appl, msgnum, func, info;
__u32 controller;
BT_DBG("session %p skb %p len %d", session, skb, skb->len);
BT_DBG("session %pK skb %pK len %d", session, skb, skb->len);
switch (CAPIMSG_SUBCOMMAND(skb->data)) {
case CAPI_CONF:
@ -329,7 +330,7 @@ void cmtp_recv_capimsg(struct cmtp_session *session, struct sk_buff *skb)
__u16 appl;
__u32 contr;
BT_DBG("session %p skb %p len %d", session, skb, skb->len);
BT_DBG("session %pK skb %pK len %d", session, skb, skb->len);
if (skb->len < CAPI_MSG_BASELEN)
return;
@ -373,7 +374,7 @@ void cmtp_recv_capimsg(struct cmtp_session *session, struct sk_buff *skb)
static int cmtp_load_firmware(struct capi_ctr *ctrl, capiloaddata *data)
{
BT_DBG("ctrl %p data %p", ctrl, data);
BT_DBG("ctrl %pK data %pK", ctrl, data);
return 0;
}
@ -382,7 +383,7 @@ static void cmtp_reset_ctr(struct capi_ctr *ctrl)
{
struct cmtp_session *session = ctrl->driverdata;
BT_DBG("ctrl %p", ctrl);
BT_DBG("ctrl %pK", ctrl);
capi_ctr_down(ctrl);
@ -399,8 +400,8 @@ static void cmtp_register_appl(struct capi_ctr *ctrl, __u16 appl, capi_register_
unsigned char buf[8];
int err = 0, nconn, want = rp->level3cnt;
BT_DBG("ctrl %p appl %d level3cnt %d datablkcnt %d datablklen %d",
ctrl, appl, rp->level3cnt, rp->datablkcnt, rp->datablklen);
BT_DBG("ctrl %pK appl %d level3cnt %d datablkcnt %d datablklen %d",
ctrl, appl, rp->level3cnt, rp->datablkcnt, rp->datablklen);
application = cmtp_application_add(session, appl);
if (!application) {
@ -464,7 +465,7 @@ static void cmtp_release_appl(struct capi_ctr *ctrl, __u16 appl)
struct cmtp_session *session = ctrl->driverdata;
struct cmtp_application *application;
BT_DBG("ctrl %p appl %d", ctrl, appl);
BT_DBG("ctrl %pK appl %d", ctrl, appl);
application = cmtp_application_get(session, CMTP_APPLID, appl);
if (!application) {
@ -490,7 +491,7 @@ static u16 cmtp_send_message(struct capi_ctr *ctrl, struct sk_buff *skb)
__u16 appl;
__u32 contr;
BT_DBG("ctrl %p skb %p", ctrl, skb);
BT_DBG("ctrl %pK skb %pK", ctrl, skb);
appl = CAPIMSG_APPID(skb->data);
contr = CAPIMSG_CONTROL(skb->data);
@ -555,7 +556,7 @@ int cmtp_attach_device(struct cmtp_session *session)
unsigned char buf[4];
long ret;
BT_DBG("session %p", session);
BT_DBG("session %pK", session);
capimsg_setu32(buf, 0, 0);
@ -597,7 +598,7 @@ int cmtp_attach_device(struct cmtp_session *session)
session->num = session->ctrl.cnr;
BT_DBG("session %p num %d", session, session->num);
BT_DBG("session %pK num %d", session, session->num);
capimsg_setu32(buf, 0, 1);
@ -618,7 +619,7 @@ int cmtp_attach_device(struct cmtp_session *session)
void cmtp_detach_device(struct cmtp_session *session)
{
BT_DBG("session %p", session);
BT_DBG("session %pK", session);
detach_capi_ctr(&session->ctrl);
}

10
net/bluetooth/cmtp/core.c
View File

@ -108,7 +108,7 @@ static inline void cmtp_add_msgpart(struct cmtp_session *session, int id, const
struct sk_buff *skb = session->reassembly[id], *nskb;
int size;
BT_DBG("session %p buf %p count %d", session, buf, count);
BT_DBG("session %pK buf %pK count %d", session, buf, count);
size = (skb) ? skb->len + count : count;
@ -133,7 +133,7 @@ static inline int cmtp_recv_frame(struct cmtp_session *session, struct sk_buff *
__u8 hdr, hdrlen, id;
__u16 len;
BT_DBG("session %p skb %p len %d", session, skb, skb->len);
BT_DBG("session %pK skb %pK len %d", session, skb, skb->len);
while (skb->len > 0) {
hdr = skb->data[0];
@ -196,7 +196,7 @@ static int cmtp_send_frame(struct cmtp_session *session, unsigned char *data, in
struct kvec iv = { data, len };
struct msghdr msg;
BT_DBG("session %p data %p len %d", session, data, len);
BT_DBG("session %pK data %pK len %d", session, data, len);
if (!len)
return 0;
@ -212,7 +212,7 @@ static void cmtp_process_transmit(struct cmtp_session *session)
unsigned char *hdr;
unsigned int size, tail;
BT_DBG("session %p", session);
BT_DBG("session %pK", session);
nskb = alloc_skb(session->mtu, GFP_ATOMIC);
if (!nskb) {
@ -282,7 +282,7 @@ static int cmtp_session(void *arg)
struct sk_buff *skb;
wait_queue_t wait;
BT_DBG("session %p", session);
BT_DBG("session %pK", session);
set_user_nice(current, -15);

4
net/bluetooth/cmtp/sock.c
View File

@ -50,7 +50,7 @@ static int cmtp_sock_release(struct socket *sock)
{
struct sock *sk = sock->sk;
BT_DBG("sock %p sk %p", sock, sk);
BT_DBG("sock %pK sk %pK", sock, sk);
if (!sk)
return 0;
@ -200,7 +200,7 @@ static int cmtp_sock_create(struct net *net, struct socket *sock, int protocol,
{
struct sock *sk;
BT_DBG("sock %p", sock);
BT_DBG("sock %pK", sock);
if (sock->type != SOCK_RAW)
return -ESOCKTNOSUPPORT;

46
net/bluetooth/hci_conn.c
View File

@ -67,7 +67,7 @@ static void hci_acl_create_connection(struct hci_conn *conn)
struct inquiry_entry *ie;
struct hci_cp_create_conn cp;
BT_DBG("hcon %p", conn);
BT_DBG("hcon %pK", conn);
conn->state = BT_CONNECT;
conn->out = true;
@ -111,7 +111,7 @@ static void hci_acl_create_connection_cancel(struct hci_conn *conn)
{
struct hci_cp_create_conn_cancel cp;
BT_DBG("hcon %p", conn);
BT_DBG("hcon %pK", conn);
if (conn->hdev->hci_ver < BLUETOOTH_VER_1_2)
return;
@ -134,7 +134,7 @@ void hci_disconnect(struct hci_conn *conn, __u8 reason)
{
struct hci_cp_disconnect cp;
BT_DBG("hcon %p", conn);
BT_DBG("hcon %pK", conn);
conn->state = BT_DISCONN;
@ -147,7 +147,7 @@ static void hci_amp_disconn(struct hci_conn *conn, __u8 reason)
{
struct hci_cp_disconn_phy_link cp;
BT_DBG("hcon %p", conn);
BT_DBG("hcon %pK", conn);
conn->state = BT_DISCONN;
@ -162,7 +162,7 @@ static void hci_add_sco(struct hci_conn *conn, __u16 handle)
struct hci_dev *hdev = conn->hdev;
struct hci_cp_add_sco cp;
BT_DBG("hcon %p", conn);
BT_DBG("hcon %pK", conn);
conn->state = BT_CONNECT;
conn->out = true;
@ -180,7 +180,7 @@ void hci_setup_sync(struct hci_conn *conn, __u16 handle)
struct hci_dev *hdev = conn->hdev;
struct hci_cp_setup_sync_conn cp;
BT_DBG("hcon %p", conn);
BT_DBG("hcon %pK", conn);
conn->state = BT_CONNECT;
conn->out = true;
@ -224,7 +224,7 @@ void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __u8 rand[8],
struct hci_dev *hdev = conn->hdev;
struct hci_cp_le_start_enc cp;
BT_DBG("hcon %p", conn);
BT_DBG("hcon %pK", conn);
memset(&cp, 0, sizeof(cp));
@ -244,7 +244,7 @@ void hci_sco_setup(struct hci_conn *conn, __u8 status)
if (!sco)
return;
BT_DBG("hcon %p", conn);
BT_DBG("hcon %pK", conn);
if (!status) {
if (lmp_esco_capable(conn->hdev))
@ -276,7 +276,7 @@ static void hci_conn_timeout(struct work_struct *work)
struct hci_conn *conn = container_of(work, struct hci_conn,
disc_work.work);
BT_DBG("hcon %p state %s", conn, state_to_string(conn->state));
BT_DBG("hcon %pK state %s", conn, state_to_string(conn->state));
if (atomic_read(&conn->refcnt))
return;
@ -308,7 +308,7 @@ static void hci_conn_enter_sniff_mode(struct hci_conn *conn)
{
struct hci_dev *hdev = conn->hdev;
BT_DBG("hcon %p mode %d", conn, conn->mode);
BT_DBG("hcon %pK mode %d", conn, conn->mode);
if (test_bit(HCI_RAW, &hdev->flags))
return;
@ -346,7 +346,7 @@ static void hci_conn_idle(unsigned long arg)
{
struct hci_conn *conn = (void *) arg;
BT_DBG("hcon %p mode %d", conn, conn->mode);
BT_DBG("hcon %pK mode %d", conn, conn->mode);
hci_conn_enter_sniff_mode(conn);
}
@ -435,7 +435,7 @@ int hci_conn_del(struct hci_conn *conn)
{
struct hci_dev *hdev = conn->hdev;
BT_DBG("%s hcon %p handle %d", hdev->name, conn, conn->handle);
BT_DBG("%s hcon %pK handle %d", hdev->name, conn, conn->handle);
del_timer(&conn->idle_timer);
@ -662,7 +662,7 @@ struct hci_conn *hci_connect(struct hci_dev *hdev, int type,
/* Check link security requirement */
int hci_conn_check_link_mode(struct hci_conn *conn)
{
BT_DBG("hcon %p", conn);
BT_DBG("hcon %pK", conn);
if (hci_conn_ssp_enabled(conn) && !(conn->link_mode & HCI_LM_ENCRYPT))
return 0;
@ -673,7 +673,7 @@ int hci_conn_check_link_mode(struct hci_conn *conn)
/* Authenticate remote device */
static int hci_conn_auth(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)
{
BT_DBG("hcon %p", conn);
BT_DBG("hcon %pK", conn);
if (conn->pending_sec_level > sec_level)
sec_level = conn->pending_sec_level;
@ -710,7 +710,7 @@ static int hci_conn_auth(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)
/* Encrypt the the link */
static void hci_conn_encrypt(struct hci_conn *conn)
{
BT_DBG("hcon %p", conn);
BT_DBG("hcon %pK", conn);
if (!test_and_set_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags)) {
struct hci_cp_set_conn_encrypt cp;
@ -724,7 +724,7 @@ static void hci_conn_encrypt(struct hci_conn *conn)
/* Enable security */
int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)
{
BT_DBG("hcon %p", conn);
BT_DBG("hcon %pK", conn);
if (conn->type == LE_LINK)
return smp_conn_security(conn, sec_level);
@ -780,7 +780,7 @@ EXPORT_SYMBOL(hci_conn_security);
/* Check secure link requirement */
int hci_conn_check_secure(struct hci_conn *conn, __u8 sec_level)
{
BT_DBG("hcon %p", conn);
BT_DBG("hcon %pK", conn);
if (sec_level != BT_SECURITY_HIGH)
return 1; /* Accept if non-secure is required */
@ -795,7 +795,7 @@ EXPORT_SYMBOL(hci_conn_check_secure);
/* Change link key */
int hci_conn_change_link_key(struct hci_conn *conn)
{
BT_DBG("hcon %p", conn);
BT_DBG("hcon %pK", conn);
if (!test_and_set_bit(HCI_CONN_AUTH_PEND, &conn->flags)) {
struct hci_cp_change_conn_link_key cp;
@ -810,7 +810,7 @@ int hci_conn_change_link_key(struct hci_conn *conn)
/* Switch role */
int hci_conn_switch_role(struct hci_conn *conn, __u8 role)
{
BT_DBG("hcon %p", conn);
BT_DBG("hcon %pK", conn);
if (!role && conn->link_mode & HCI_LM_MASTER)
return 1;
@ -849,7 +849,7 @@ void hci_conn_enter_active_mode(struct hci_conn *conn, __u8 force_active)
{
struct hci_dev *hdev = conn->hdev;
BT_DBG("hcon %p mode %d", conn, conn->mode);
BT_DBG("hcon %pK mode %d", conn, conn->mode);
if (test_bit(HCI_RAW, &hdev->flags))
return;
@ -1031,7 +1031,7 @@ struct hci_chan *hci_chan_create(struct hci_conn *conn)
struct hci_dev *hdev = conn->hdev;
struct hci_chan *chan;
BT_DBG("%s hcon %p", hdev->name, conn);
BT_DBG("%s hcon %pK", hdev->name, conn);
chan = kzalloc(sizeof(struct hci_chan), GFP_KERNEL);
if (!chan)
@ -1051,7 +1051,7 @@ void hci_chan_del(struct hci_chan *chan)
struct hci_conn *conn = chan->conn;
struct hci_dev *hdev = conn->hdev;
BT_DBG("%s hcon %p chan %p", hdev->name, conn, chan);
BT_DBG("%s hcon %pK chan %pK", hdev->name, conn, chan);
list_del_rcu(&chan->list);
@ -1067,7 +1067,7 @@ void hci_chan_list_flush(struct hci_conn *conn)
{
struct hci_chan *chan, *n;
BT_DBG("hcon %p", conn);
BT_DBG("hcon %pK", conn);
list_for_each_entry_safe(chan, n, &conn->chan_list, list)
hci_chan_del(chan);

48
net/bluetooth/hci_core.c
View File

@ -771,7 +771,7 @@ struct inquiry_entry *hci_inquiry_cache_lookup(struct hci_dev *hdev,
struct discovery_state *cache = &hdev->discovery;
struct inquiry_entry *e;
BT_DBG("cache %p, %pMR", cache, bdaddr);
BT_DBG("cache %pK, %pMR", cache, bdaddr);
list_for_each_entry(e, &cache->all, all) {
if (!bacmp(&e->data.bdaddr, bdaddr))
@ -787,7 +787,7 @@ struct inquiry_entry *hci_inquiry_cache_lookup_unknown(struct hci_dev *hdev,
struct discovery_state *cache = &hdev->discovery;
struct inquiry_entry *e;
BT_DBG("cache %p, %pMR", cache, bdaddr);
BT_DBG("cache %pK, %pMR", cache, bdaddr);
list_for_each_entry(e, &cache->unknown, list) {
if (!bacmp(&e->data.bdaddr, bdaddr))
@ -804,7 +804,7 @@ struct inquiry_entry *hci_inquiry_cache_lookup_resolve(struct hci_dev *hdev,
struct discovery_state *cache = &hdev->discovery;
struct inquiry_entry *e;
BT_DBG("cache %p bdaddr %pMR state %d", cache, bdaddr, state);
BT_DBG("cache %pK bdaddr %pMR state %d", cache, bdaddr, state);
list_for_each_entry(e, &cache->resolve, list) {
if (!bacmp(bdaddr, BDADDR_ANY) && e->name_state == state)
@ -841,7 +841,7 @@ bool hci_inquiry_cache_update(struct hci_dev *hdev, struct inquiry_data *data,
struct discovery_state *cache = &hdev->discovery;
struct inquiry_entry *ie;
BT_DBG("cache %p, %pMR", cache, &data->bdaddr);
BT_DBG("cache %pK, %pMR", cache, &data->bdaddr);
hci_remove_remote_oob_data(hdev, &data->bdaddr);
@ -917,7 +917,7 @@ static int inquiry_cache_dump(struct hci_dev *hdev, int num, __u8 *buf)
copied++;
}
BT_DBG("cache %p, copied %d", cache, copied);
BT_DBG("cache %pK, copied %d", cache, copied);
return copied;
}
@ -1114,7 +1114,7 @@ int hci_dev_open(__u16 dev)
if (!hdev)
return -ENODEV;
BT_DBG("%s %p", hdev->name, hdev);
BT_DBG("%s %pK", hdev->name, hdev);
hci_req_lock(hdev);
@ -1203,7 +1203,7 @@ done:
static int hci_dev_do_close(struct hci_dev *hdev)
{
BT_DBG("%s %p", hdev->name, hdev);
BT_DBG("%s %pK", hdev->name, hdev);
cancel_work_sync(&hdev->le_scan);
@ -1550,7 +1550,7 @@ static int hci_rfkill_set_block(void *data, bool blocked)
{
struct hci_dev *hdev = data;
BT_DBG("%p name %s blocked %d", hdev, hdev->name, blocked);
BT_DBG("%pK name %s blocked %d", hdev, hdev->name, blocked);
if (blocked) {
set_bit(HCI_RFKILLED, &hdev->dev_flags);
@ -2219,7 +2219,7 @@ int hci_register_dev(struct hci_dev *hdev)
snprintf(hdev->name, sizeof(hdev->name), "hci%d", id);
hdev->id = id;
BT_DBG("%p name %s bus %d", hdev, hdev->name, hdev->bus);
BT_DBG("%pK name %s bus %d", hdev, hdev->name, hdev->bus);
hdev->workqueue = alloc_workqueue(hdev->name, WQ_HIGHPRI | WQ_UNBOUND |
WQ_MEM_RECLAIM, 1);
@ -2288,7 +2288,7 @@ void hci_unregister_dev(struct hci_dev *hdev)
{
int i, id;
BT_DBG("%p name %s bus %d", hdev, hdev->name, hdev->bus);
BT_DBG("%pK name %s bus %d", hdev, hdev->name, hdev->bus);
set_bit(HCI_UNREGISTER, &hdev->dev_flags);
@ -2554,7 +2554,7 @@ EXPORT_SYMBOL(hci_recv_stream_fragment);
int hci_register_cb(struct hci_cb *cb)
{
BT_DBG("%p name %s", cb, cb->name);
BT_DBG("%pK name %s", cb, cb->name);
write_lock(&hci_cb_list_lock);
list_add(&cb->list, &hci_cb_list);
@ -2566,7 +2566,7 @@ EXPORT_SYMBOL(hci_register_cb);
int hci_unregister_cb(struct hci_cb *cb)
{
BT_DBG("%p name %s", cb, cb->name);
BT_DBG("%pK name %s", cb, cb->name);
write_lock(&hci_cb_list_lock);
list_del(&cb->list);
@ -2789,12 +2789,12 @@ static void hci_queue_acl(struct hci_chan *chan, struct sk_buff_head *queue,
list = skb_shinfo(skb)->frag_list;
if (!list) {
/* Non fragmented */
BT_DBG("%s nonfrag skb %p len %d", hdev->name, skb, skb->len);
BT_DBG("%s nonfrag skb %pK len %d", hdev->name, skb, skb->len);
skb_queue_tail(queue, skb);
} else {
/* Fragmented */
BT_DBG("%s frag %p len %d", hdev->name, skb, skb->len);
BT_DBG("%s frag %pK len %d", hdev->name, skb, skb->len);
skb_shinfo(skb)->frag_list = NULL;
@ -2812,7 +2812,7 @@ static void hci_queue_acl(struct hci_chan *chan, struct sk_buff_head *queue,
bt_cb(skb)->pkt_type = HCI_ACLDATA_PKT;
hci_add_acl_hdr(skb, conn->handle, flags);
BT_DBG("%s frag %p len %d", hdev->name, skb, skb->len);
BT_DBG("%s frag %pK len %d", hdev->name, skb, skb->len);
__skb_queue_tail(queue, skb);
} while (list);
@ -2825,7 +2825,7 @@ void hci_send_acl(struct hci_chan *chan, struct sk_buff *skb, __u16 flags)
{
struct hci_dev *hdev = chan->conn->hdev;
BT_DBG("%s chan %p flags 0x%4.4x", hdev->name, chan, flags);
BT_DBG("%s chan %pK flags 0x%4.4x", hdev->name, chan, flags);
skb->dev = (void *) hdev;
@ -2915,7 +2915,7 @@ static struct hci_conn *hci_low_sent(struct hci_dev *hdev, __u8 type,
} else
*quote = 0;
BT_DBG("conn %p quote %d", conn, *quote);
BT_DBG("conn %pK quote %d", conn, *quote);
return conn;
}
@ -3018,7 +3018,7 @@ static struct hci_chan *hci_chan_sent(struct hci_dev *hdev, __u8 type,
q = cnt / num;
*quote = q ? q : 1;
BT_DBG("chan %p quote %d", chan, *quote);
BT_DBG("chan %pK quote %d", chan, *quote);
return chan;
}
@ -3060,7 +3060,7 @@ static void hci_prio_recalculate(struct hci_dev *hdev, __u8 type)
skb->priority = HCI_PRIO_MAX - 1;
BT_DBG("chan %p skb %p promoted to %d", chan, skb,
BT_DBG("chan %pK skb %pK promoted to %d", chan, skb,
skb->priority);
}
@ -3102,7 +3102,7 @@ static void hci_sched_acl_pkt(struct hci_dev *hdev)
(chan = hci_chan_sent(hdev, ACL_LINK, &quote))) {
u32 priority = (skb_peek(&chan->data_q))->priority;
while (quote-- && (skb = skb_peek(&chan->data_q))) {
BT_DBG("chan %p skb %p len %d priority %u", chan, skb,
BT_DBG("chan %pK skb %pK len %d priority %u", chan, skb,
skb->len, skb->priority);
/* Stop if priority has changed */
@ -3150,7 +3150,7 @@ static void hci_sched_acl_blk(struct hci_dev *hdev)
while (quote > 0 && (skb = skb_peek(&chan->data_q))) {
int blocks;
BT_DBG("chan %p skb %p len %d priority %u", chan, skb,
BT_DBG("chan %pK skb %pK len %d priority %u", chan, skb,
skb->len, skb->priority);
/* Stop if priority has changed */
@ -3218,7 +3218,7 @@ static void hci_sched_sco(struct hci_dev *hdev)
while (hdev->sco_cnt && (conn = hci_low_sent(hdev, SCO_LINK, &quote))) {
while (quote-- && (skb = skb_dequeue(&conn->data_q))) {
BT_DBG("skb %p len %d", skb, skb->len);
BT_DBG("skb %pK len %d", skb, skb->len);
hci_send_frame(skb);
conn->sent++;
@ -3242,7 +3242,7 @@ static void hci_sched_esco(struct hci_dev *hdev)
while (hdev->sco_cnt && (conn = hci_low_sent(hdev, ESCO_LINK,
&quote))) {
while (quote-- && (skb = skb_dequeue(&conn->data_q))) {
BT_DBG("skb %p len %d", skb, skb->len);
BT_DBG("skb %pK len %d", skb, skb->len);
hci_send_frame(skb);
conn->sent++;
@ -3276,7 +3276,7 @@ static void hci_sched_le(struct hci_dev *hdev)
while (cnt && (chan = hci_chan_sent(hdev, LE_LINK, &quote))) {
u32 priority = (skb_peek(&chan->data_q))->priority;
while (quote-- && (skb = skb_peek(&chan->data_q))) {
BT_DBG("chan %p skb %p len %d priority %u", chan, skb,
BT_DBG("chan %pK skb %pK len %d priority %u", chan, skb,
skb->len, skb->priority);
/* Stop if priority has changed */

12
net/bluetooth/hci_event.c
View File

@ -1106,7 +1106,7 @@ static void hci_cs_create_conn(struct hci_dev *hdev, __u8 status)
conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &cp->bdaddr);
BT_DBG("%s bdaddr %pMR hcon %p", hdev->name, &cp->bdaddr, conn);
BT_DBG("%s bdaddr %pMR hcon %pK", hdev->name, &cp->bdaddr, conn);
if (status) {
if (conn && conn->state == BT_CONNECT) {
@ -1535,7 +1535,7 @@ static void hci_cs_le_create_conn(struct hci_dev *hdev, __u8 status)
return;
}
BT_DBG("%s bdaddr %pMR conn %p", hdev->name, &conn->dst, conn);
BT_DBG("%s bdaddr %pMR conn %pK", hdev->name, &conn->dst, conn);
conn->state = BT_CLOSED;
mgmt_connect_failed(hdev, &conn->dst, conn->type,
@ -2533,7 +2533,7 @@ static void hci_num_comp_pkts_evt(struct hci_dev *hdev, struct sk_buff *skb)
break;
default:
BT_ERR("Unknown type %d conn %p", conn->type, conn);
BT_ERR("Unknown type %d conn %pK", conn->type, conn);
break;
}
}
@ -2604,7 +2604,7 @@ static void hci_num_comp_blocks_evt(struct hci_dev *hdev, struct sk_buff *skb)
break;
default:
BT_ERR("Unknown type %d conn %p", conn->type, conn);
BT_ERR("Unknown type %d conn %pK", conn->type, conn);
break;
}
}
@ -3451,7 +3451,7 @@ static void hci_phy_link_complete_evt(struct hci_dev *hdev,
return;
}
BT_DBG("hcon %p mgr %p", hcon, hcon->amp_mgr);
BT_DBG("hcon %pK mgr %pK", hcon, hcon->amp_mgr);
mgr = hcon->amp_mgr;
if (!(mgr && mgr->l2cap_conn && mgr->l2cap_conn->hcon)) {
@ -3497,7 +3497,7 @@ static void hci_loglink_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
hchan->handle = le16_to_cpu(ev->handle);
BT_DBG("hcon %p mgr %p hchan %p", hcon, hcon->amp_mgr, hchan);
BT_DBG("hcon %pK mgr %pK hchan %pK", hcon, hcon->amp_mgr, hchan);
mgr = hcon->amp_mgr;
if (mgr && mgr->bredr_chan) {

20
net/bluetooth/hci_sock.c
View File

@ -72,7 +72,7 @@ void hci_send_to_sock(struct hci_dev *hdev, struct sk_buff *skb)
struct sock *sk;
struct sk_buff *skb_copy = NULL;
BT_DBG("hdev %p len %d", hdev, skb->len);
BT_DBG("hdev %pK len %d", hdev, skb->len);
read_lock(&hci_sk_list.lock);
@ -180,7 +180,7 @@ void hci_send_to_monitor(struct hci_dev *hdev, struct sk_buff *skb)
if (!atomic_read(&monitor_promisc))
return;
BT_DBG("hdev %p len %d", hdev, skb->len);
BT_DBG("hdev %pK len %d", hdev, skb->len);
switch (bt_cb(skb)->pkt_type) {
case HCI_COMMAND_PKT:
@ -413,7 +413,7 @@ static int hci_sock_release(struct socket *sock)
struct sock *sk = sock->sk;
struct hci_dev *hdev;
BT_DBG("sock %p sk %p", sock, sk);
BT_DBG("sock %pK sk %pK", sock, sk);
if (!sk)
return 0;
@ -590,7 +590,7 @@ static int hci_sock_bind(struct socket *sock, struct sockaddr *addr,
struct hci_dev *hdev = NULL;
int len, err = 0;
BT_DBG("sock %p sk %p", sock, sk);
BT_DBG("sock %pK sk %pK", sock, sk);
if (!addr)
return -EINVAL;
@ -679,7 +679,7 @@ static int hci_sock_getname(struct socket *sock, struct sockaddr *addr,
struct sock *sk = sock->sk;
struct hci_dev *hdev = hci_pi(sk)->hdev;
BT_DBG("sock %p sk %p", sock, sk);
BT_DBG("sock %pK sk %pK", sock, sk);
if (!hdev)
return -EBADFD;
@ -740,7 +740,7 @@ static int hci_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
struct sk_buff *skb;
int copied, err;
BT_DBG("sock %p, sk %p", sock, sk);
BT_DBG("sock %pK, sk %pK", sock, sk);
if (flags & (MSG_OOB))
return -EOPNOTSUPP;
@ -784,7 +784,7 @@ static int hci_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
struct sk_buff *skb;
int err;
BT_DBG("sock %p sk %p", sock, sk);
BT_DBG("sock %pK sk %pK", sock, sk);
if (msg->msg_flags & MSG_OOB)
return -EOPNOTSUPP;
@ -888,7 +888,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
struct sock *sk = sock->sk;
int err = 0, opt = 0;
BT_DBG("sk %p, opt %d", sk, optname);
BT_DBG("sk %pK, opt %d", sk, optname);
lock_sock(sk);
@ -971,7 +971,7 @@ static int hci_sock_getsockopt(struct socket *sock, int level, int optname,
struct sock *sk = sock->sk;
int len, opt, err = 0;
BT_DBG("sk %p, opt %d", sk, optname);
BT_DBG("sk %pK, opt %d", sk, optname);
if (get_user(len, optlen))
return -EFAULT;
@ -1061,7 +1061,7 @@ static int hci_sock_create(struct net *net, struct socket *sock, int protocol,
{
struct sock *sk;
BT_DBG("sock %p", sock);
BT_DBG("sock %pK", sock);
if (sock->type != SOCK_RAW)
return -ESOCKTNOSUPPORT;

8
net/bluetooth/hci_sysfs.c
View File

@ -103,7 +103,7 @@ void hci_conn_init_sysfs(struct hci_conn *conn)
{
struct hci_dev *hdev = conn->hdev;
BT_DBG("conn %p", conn);
BT_DBG("conn %pK", conn);
conn->dev.type = &bt_link;
conn->dev.class = bt_class;
@ -116,7 +116,7 @@ void hci_conn_add_sysfs(struct hci_conn *conn)
{
struct hci_dev *hdev = conn->hdev;
BT_DBG("conn %p", conn);
BT_DBG("conn %pK", conn);
dev_set_name(&conn->dev, "%s:%d", hdev->name, conn->handle);
@ -547,7 +547,7 @@ int hci_add_sysfs(struct hci_dev *hdev)
struct device *dev = &hdev->dev;
int err;
BT_DBG("%p name %s bus %d", hdev, hdev->name, hdev->bus);
BT_DBG("%pK name %s bus %d", hdev, hdev->name, hdev->bus);
dev_set_name(dev, "%s", hdev->name);
@ -577,7 +577,7 @@ int hci_add_sysfs(struct hci_dev *hdev)
void hci_del_sysfs(struct hci_dev *hdev)
{
BT_DBG("%p name %s bus %d", hdev, hdev->name, hdev->bus);
BT_DBG("%pK name %s bus %d", hdev, hdev->name, hdev->bus);
debugfs_remove_recursive(hdev->debugfs);

21
net/bluetooth/hidp/core.c
View File

@ -106,7 +106,7 @@ static int hidp_send_message(struct hidp_session *session, struct socket *sock,
struct sk_buff *skb;
struct sock *sk = sock->sk;
BT_DBG("session %p data %p size %d", session, data, size);
BT_DBG("session %pK data %pK size %d", session, data, size);
if (atomic_read(&session->terminate))
return -EIO;
@ -150,7 +150,7 @@ static int hidp_input_event(struct input_dev *dev, unsigned int type,
unsigned char newleds;
unsigned char hdr, data[2];
BT_DBG("session %p type %d code %d value %d",
BT_DBG("session %pK type %d code %d value %d",
session, type, code, value);
if (type != EV_LED)
@ -414,7 +414,7 @@ static void hidp_del_timer(struct hidp_session *session)
static void hidp_process_handshake(struct hidp_session *session,
unsigned char param)
{
BT_DBG("session %p param 0x%02x", session, param);
BT_DBG("session %pK param 0x%02x", session, param);
session->output_report_success = 0; /* default condition */
switch (param) {
@ -457,7 +457,7 @@ static void hidp_process_handshake(struct hidp_session *session,
static void hidp_process_hid_control(struct hidp_session *session,
unsigned char param)
{
BT_DBG("session %p param 0x%02x", session, param);
BT_DBG("session %pK param 0x%02x", session, param);
if (param == HIDP_CTRL_VIRTUAL_CABLE_UNPLUG) {
/* Flush the transmit queues */
@ -473,7 +473,8 @@ static int hidp_process_data(struct hidp_session *session, struct sk_buff *skb,
unsigned char param)
{
int done_with_skb = 1;
BT_DBG("session %p skb %p len %d param 0x%02x", session, skb, skb->len, param);
BT_DBG("session %pK skb %pK len %d param 0x%02x",
session, skb, skb->len, param);
switch (param) {
case HIDP_DATA_RTYPE_INPUT:
@ -517,7 +518,7 @@ static void hidp_recv_ctrl_frame(struct hidp_session *session,
unsigned char hdr, type, param;
int free_skb = 1;
BT_DBG("session %p skb %p len %d", session, skb, skb->len);
BT_DBG("session %pK skb %pK len %d", session, skb, skb->len);
hdr = skb->data[0];
skb_pull(skb, 1);
@ -553,7 +554,7 @@ static void hidp_recv_intr_frame(struct hidp_session *session,
{
unsigned char hdr;
BT_DBG("session %p skb %p len %d", session, skb, skb->len);
BT_DBG("session %pK skb %pK len %d", session, skb, skb->len);
hdr = skb->data[0];
skb_pull(skb, 1);
@ -580,7 +581,7 @@ static int hidp_send_frame(struct socket *sock, unsigned char *data, int len)
struct kvec iv = { data, len };
struct msghdr msg;
BT_DBG("sock %p data %p len %d", sock, data, len);
BT_DBG("sock %pK data %pK len %d", sock, data, len);
if (!len)
return 0;
@ -598,7 +599,7 @@ static void hidp_process_transmit(struct hidp_session *session,
struct sk_buff *skb;
int ret;
BT_DBG("session %p", session);
BT_DBG("session %pK", session);
while ((skb = skb_dequeue(transmit))) {
ret = hidp_send_frame(sock, skb->data, skb->len);
@ -1192,7 +1193,7 @@ static int hidp_session_thread(void *arg)
struct hidp_session *session = arg;
wait_queue_t ctrl_wait, intr_wait;
BT_DBG("session %p", session);
BT_DBG("session %pK", session);
/* initialize runtime environment */
hidp_session_get(session);

4
net/bluetooth/hidp/sock.c
View File

@ -33,7 +33,7 @@ static int hidp_sock_release(struct socket *sock)
{
struct sock *sk = sock->sk;
BT_DBG("sock %p sk %p", sock, sk);
BT_DBG("sock %pK sk %pK", sock, sk);
if (!sk)
return 0;
@ -230,7 +230,7 @@ static int hidp_sock_create(struct net *net, struct socket *sock, int protocol,
{
struct sock *sk;
BT_DBG("sock %p", sock);
BT_DBG("sock %pK", sock);
if (sock->type != SOCK_RAW)
return -ESOCKTNOSUPPORT;

185
net/bluetooth/l2cap_core.c
View File

@ -224,7 +224,7 @@ static u16 l2cap_alloc_cid(struct l2cap_conn *conn)
static void __l2cap_state_change(struct l2cap_chan *chan, int state)
{
BT_DBG("chan %p %s -> %s", chan, state_to_string(chan->state),
BT_DBG("chan %pK %s -> %s", chan, state_to_string(chan->state),
state_to_string(state));
chan->state = state;
@ -412,7 +412,7 @@ static void l2cap_chan_timeout(struct work_struct *work)
struct l2cap_conn *conn = chan->conn;
int reason;
BT_DBG("chan %p state %s", chan, state_to_string(chan->state));
BT_DBG("chan %pK state %s", chan, state_to_string(chan->state));
mutex_lock(&conn->chan_lock);
l2cap_chan_lock(chan);
@ -458,7 +458,7 @@ struct l2cap_chan *l2cap_chan_create(void)
/* This flag is cleared in l2cap_chan_ready() */
set_bit(CONF_NOT_COMPLETE, &chan->conf_state);
BT_DBG("chan %p", chan);
BT_DBG("chan %pK", chan);
return chan;
}
@ -467,7 +467,7 @@ static void l2cap_chan_destroy(struct kref *kref)
{
struct l2cap_chan *chan = container_of(kref, struct l2cap_chan, kref);
BT_DBG("chan %p", chan);
BT_DBG("chan %pK", chan);
write_lock(&chan_list_lock);
list_del(&chan->global_l);
@ -478,14 +478,14 @@ static void l2cap_chan_destroy(struct kref *kref)
void l2cap_chan_hold(struct l2cap_chan *c)
{
BT_DBG("chan %p orig refcnt %d", c, atomic_read(&c->kref.refcount));
BT_DBG("chan %pK orig refcnt %d", c, atomic_read(&c->kref.refcount));
kref_get(&c->kref);
}
void l2cap_chan_put(struct l2cap_chan *c)
{
BT_DBG("chan %p orig refcnt %d", c, atomic_read(&c->kref.refcount));
BT_DBG("chan %pK orig refcnt %d", c, atomic_read(&c->kref.refcount));
kref_put(&c->kref, l2cap_chan_destroy);
}
@ -504,7 +504,7 @@ void l2cap_chan_set_defaults(struct l2cap_chan *chan)
void __l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan)
{
BT_DBG("conn %p, psm 0x%2.2x, dcid 0x%4.4x", conn,
BT_DBG("conn %pK, psm 0x%2.2x, dcid 0x%4.4x", conn,
__le16_to_cpu(chan->psm), chan->dcid);
conn->disc_reason = HCI_ERROR_REMOTE_USER_TERM;
@ -571,7 +571,7 @@ void l2cap_chan_del(struct l2cap_chan *chan, int err)
__clear_chan_timer(chan);
BT_DBG("chan %p, conn %p, err %d", chan, conn, err);
BT_DBG("chan %pK, conn %pK, err %d", chan, conn, err);
if (conn) {
struct amp_mgr *mgr = conn->hcon->amp_mgr;
@ -592,7 +592,7 @@ void l2cap_chan_del(struct l2cap_chan *chan, int err)
if (chan->hs_hchan) {
struct hci_chan *hs_hchan = chan->hs_hchan;
BT_DBG("chan %p disconnect hs_hchan %p", chan, hs_hchan);
BT_DBG("chan %pK disconnect hs_hchan %pK", chan, hs_hchan);
amp_disconnect_logical_link(hs_hchan);
}
@ -630,7 +630,7 @@ 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 %s sk %p", chan, state_to_string(chan->state),
BT_DBG("chan %pK state %s sk %pK", chan, state_to_string(chan->state),
sk);
switch (chan->state) {
@ -782,7 +782,7 @@ static void l2cap_do_send(struct l2cap_chan *chan, struct sk_buff *skb)
struct hci_conn *hcon = chan->conn->hcon;
u16 flags;
BT_DBG("chan %p, skb %p len %d priority %u", chan, skb, skb->len,
BT_DBG("chan %pK, skb %pK len %d priority %u", chan, skb, skb->len,
skb->priority);
if (chan->hs_hcon && !__chan_is_moving(chan)) {
@ -964,7 +964,7 @@ static void l2cap_send_sframe(struct l2cap_chan *chan,
struct sk_buff *skb;
u32 control_field;
BT_DBG("chan %p, control %p", chan, control);
BT_DBG("chan %pK, control %pK", chan, control);
if (!control->sframe)
return;
@ -1003,7 +1003,7 @@ static void l2cap_send_rr_or_rnr(struct l2cap_chan *chan, bool poll)
{
struct l2cap_ctrl control;
BT_DBG("chan %p, poll %d", chan, poll);
BT_DBG("chan %pK, poll %d", chan, poll);
memset(&control, 0, sizeof(control));
control.sframe = 1;
@ -1074,7 +1074,7 @@ static void l2cap_move_setup(struct l2cap_chan *chan)
{
struct sk_buff *skb;
BT_DBG("chan %p", chan);
BT_DBG("chan %pK", chan);
if (chan->mode != L2CAP_MODE_ERTM)
return;
@ -1108,7 +1108,7 @@ static void l2cap_move_setup(struct l2cap_chan *chan)
static void l2cap_move_done(struct l2cap_chan *chan)
{
u8 move_role = chan->move_role;
BT_DBG("chan %p", chan);
BT_DBG("chan %pK", chan);
chan->move_state = L2CAP_MOVE_STABLE;
chan->move_role = L2CAP_MOVE_ROLE_NONE;
@ -1141,7 +1141,7 @@ static void l2cap_chan_ready(struct l2cap_chan *chan)
static void l2cap_start_connection(struct l2cap_chan *chan)
{
if (__amp_capable(chan)) {
BT_DBG("chan %p AMP capable: discover AMPs", chan);
BT_DBG("chan %pK AMP capable: discover AMPs", chan);
a2mp_discover_amp(chan);
} else {
l2cap_send_conn_req(chan);
@ -1231,7 +1231,7 @@ static void l2cap_conn_start(struct l2cap_conn *conn)
{
struct l2cap_chan *chan, *tmp;
BT_DBG("conn %p", conn);
BT_DBG("conn %pK", conn);
mutex_lock(&conn->chan_lock);
@ -1397,7 +1397,7 @@ static void l2cap_conn_ready(struct l2cap_conn *conn)
struct l2cap_chan *chan;
struct hci_conn *hcon = conn->hcon;
BT_DBG("conn %p", conn);
BT_DBG("conn %pK", conn);
if (!hcon->out && hcon->type == LE_LINK)
l2cap_le_conn_ready(conn);
@ -1442,7 +1442,7 @@ static void l2cap_conn_unreliable(struct l2cap_conn *conn, int err)
{
struct l2cap_chan *chan;
BT_DBG("conn %p", conn);
BT_DBG("conn %pK", conn);
mutex_lock(&conn->chan_lock);
@ -1556,7 +1556,7 @@ static void l2cap_conn_del(struct hci_conn *hcon, int err)
if (!conn)
return;
BT_DBG("hcon %p conn %p, err %d", hcon, conn, err);
BT_DBG("hcon %pK conn %pK, err %d", hcon, conn, err);
kfree_skb(conn->rx_skb);
@ -1599,7 +1599,7 @@ static void security_timeout(struct work_struct *work)
struct l2cap_conn *conn = container_of(work, struct l2cap_conn,
security_timer.work);
BT_DBG("conn %p", conn);
BT_DBG("conn %pK", conn);
if (test_and_clear_bit(HCI_CONN_LE_SMP_PEND, &conn->hcon->flags)) {
smp_chan_destroy(conn);
@ -1631,7 +1631,7 @@ static struct l2cap_conn *l2cap_conn_add(struct hci_conn *hcon)
hci_conn_get(conn->hcon);
conn->hchan = hchan;
BT_DBG("hcon %p conn %p hchan %p", hcon, conn, hchan);
BT_DBG("hcon %pK conn %pK hchan %pK", hcon, conn, hchan);
switch (hcon->type) {
case LE_LINK:
@ -1934,7 +1934,7 @@ static void l2cap_monitor_timeout(struct work_struct *work)
struct l2cap_chan *chan = container_of(work, struct l2cap_chan,
monitor_timer.work);
BT_DBG("chan %p", chan);
BT_DBG("chan %pK", chan);
l2cap_chan_lock(chan);
@ -1955,7 +1955,7 @@ static void l2cap_retrans_timeout(struct work_struct *work)
struct l2cap_chan *chan = container_of(work, struct l2cap_chan,
retrans_timer.work);
BT_DBG("chan %p", chan);
BT_DBG("chan %pK", chan);
l2cap_chan_lock(chan);
@ -1976,7 +1976,7 @@ static void l2cap_streaming_send(struct l2cap_chan *chan,
struct sk_buff *skb;
struct l2cap_ctrl *control;
BT_DBG("chan %p, skbs %p", chan, skbs);
BT_DBG("chan %pK, skbs %pK", chan, skbs);
if (__chan_is_moving(chan))
return;
@ -2015,7 +2015,7 @@ static int l2cap_ertm_send(struct l2cap_chan *chan)
struct l2cap_ctrl *control;
int sent = 0;
BT_DBG("chan %p", chan);
BT_DBG("chan %pK", chan);
if (chan->state != BT_CONNECTED)
return -ENOTCONN;
@ -2086,7 +2086,7 @@ static void l2cap_ertm_resend(struct l2cap_chan *chan)
struct sk_buff *tx_skb;
u16 seq;
BT_DBG("chan %p", chan);
BT_DBG("chan %pK", chan);
if (test_bit(CONN_REMOTE_BUSY, &chan->conn_state))
return;
@ -2163,7 +2163,7 @@ static void l2cap_ertm_resend(struct l2cap_chan *chan)
static void l2cap_retransmit(struct l2cap_chan *chan,
struct l2cap_ctrl *control)
{
BT_DBG("chan %p, control %p", chan, control);
BT_DBG("chan %pK, control %pK", chan, control);
l2cap_seq_list_append(&chan->retrans_list, control->reqseq);
l2cap_ertm_resend(chan);
@ -2174,7 +2174,7 @@ static void l2cap_retransmit_all(struct l2cap_chan *chan,
{
struct sk_buff *skb;
BT_DBG("chan %p, control %p", chan, control);
BT_DBG("chan %pK, control %pK", chan, control);
if (control->poll)
set_bit(CONN_SEND_FBIT, &chan->conn_state);
@ -2210,7 +2210,7 @@ static void l2cap_send_ack(struct l2cap_chan *chan)
chan->last_acked_seq);
int threshold;
BT_DBG("chan %p last_acked_seq %d buffer_seq %d",
BT_DBG("chan %pK last_acked_seq %d buffer_seq %d",
chan, chan->last_acked_seq, chan->buffer_seq);
memset(&control, 0, sizeof(control));
@ -2307,7 +2307,7 @@ static struct sk_buff *l2cap_create_connless_pdu(struct l2cap_chan *chan,
int err, count, hlen = L2CAP_HDR_SIZE + L2CAP_PSMLEN_SIZE;
struct l2cap_hdr *lh;
BT_DBG("chan %p len %zu priority %u", chan, len, priority);
BT_DBG("chan %pK len %zu priority %u", chan, len, priority);
count = min_t(unsigned int, (conn->mtu - hlen), len);
@ -2341,7 +2341,7 @@ static struct sk_buff *l2cap_create_basic_pdu(struct l2cap_chan *chan,
int err, count;
struct l2cap_hdr *lh;
BT_DBG("chan %p len %zu", chan, len);
BT_DBG("chan %pK len %zu", chan, len);
count = min_t(unsigned int, (conn->mtu - L2CAP_HDR_SIZE), len);
@ -2374,7 +2374,7 @@ static struct sk_buff *l2cap_create_iframe_pdu(struct l2cap_chan *chan,
int err, count, hlen;
struct l2cap_hdr *lh;
BT_DBG("chan %p len %zu", chan, len);
BT_DBG("chan %pK len %zu", chan, len);
if (!conn)
return ERR_PTR(-ENOTCONN);
@ -2428,7 +2428,7 @@ static int l2cap_segment_sdu(struct l2cap_chan *chan,
size_t pdu_len;
u8 sar;
BT_DBG("chan %p, msg %p, len %zu", chan, msg, len);
BT_DBG("chan %pK, msg %pK, len %zu", chan, msg, len);
/* It is critical that ERTM PDUs fit in a single HCI fragment,
* so fragmented skbs are not used. The HCI layer's handling
@ -2577,7 +2577,7 @@ static void l2cap_send_srej(struct l2cap_chan *chan, u16 txseq)
struct l2cap_ctrl control;
u16 seq;
BT_DBG("chan %p, txseq %u", chan, txseq);
BT_DBG("chan %pK, txseq %u", chan, txseq);
memset(&control, 0, sizeof(control));
control.sframe = 1;
@ -2599,7 +2599,7 @@ static void l2cap_send_srej_tail(struct l2cap_chan *chan)
{
struct l2cap_ctrl control;
BT_DBG("chan %p", chan);
BT_DBG("chan %pK", chan);
if (chan->srej_list.tail == L2CAP_SEQ_LIST_CLEAR)
return;
@ -2617,7 +2617,7 @@ static void l2cap_send_srej_list(struct l2cap_chan *chan, u16 txseq)
u16 initial_head;
u16 seq;
BT_DBG("chan %p, txseq %u", chan, txseq);
BT_DBG("chan %pK, txseq %u", chan, txseq);
memset(&control, 0, sizeof(control));
control.sframe = 1;
@ -2642,7 +2642,7 @@ static void l2cap_process_reqseq(struct l2cap_chan *chan, u16 reqseq)
struct sk_buff *acked_skb;
u16 ackseq;
BT_DBG("chan %p, reqseq %u", chan, reqseq);
BT_DBG("chan %pK, reqseq %u", chan, reqseq);
if (chan->unacked_frames == 0 || reqseq == chan->expected_ack_seq)
return;
@ -2671,7 +2671,7 @@ static void l2cap_process_reqseq(struct l2cap_chan *chan, u16 reqseq)
static void l2cap_abort_rx_srej_sent(struct l2cap_chan *chan)
{
BT_DBG("chan %p", chan);
BT_DBG("chan %pK", chan);
chan->expected_tx_seq = chan->buffer_seq;
l2cap_seq_list_clear(&chan->srej_list);
@ -2683,7 +2683,7 @@ static void l2cap_tx_state_xmit(struct l2cap_chan *chan,
struct l2cap_ctrl *control,
struct sk_buff_head *skbs, u8 event)
{
BT_DBG("chan %p, control %p, skbs %p, event %d", chan, control, skbs,
BT_DBG("chan %pK, control %pK, skbs %pK, event %d", chan, control, skbs,
event);
switch (event) {
@ -2755,7 +2755,7 @@ static void l2cap_tx_state_wait_f(struct l2cap_chan *chan,
struct l2cap_ctrl *control,
struct sk_buff_head *skbs, u8 event)
{
BT_DBG("chan %p, control %p, skbs %p, event %d", chan, control, skbs,
BT_DBG("chan %pK, control %pK, skbs %pK, event %d", chan, control, skbs,
event);
switch (event) {
@ -2832,7 +2832,7 @@ static void l2cap_tx_state_wait_f(struct l2cap_chan *chan,
static void l2cap_tx(struct l2cap_chan *chan, struct l2cap_ctrl *control,
struct sk_buff_head *skbs, u8 event)
{
BT_DBG("chan %p, control %p, skbs %p, event %d, state %d",
BT_DBG("chan %pK, control %pK, skbs %pK, event %d, state %d",
chan, control, skbs, event, chan->tx_state);
switch (chan->tx_state) {
@ -2851,14 +2851,14 @@ static void l2cap_tx(struct l2cap_chan *chan, struct l2cap_ctrl *control,
static void l2cap_pass_to_tx(struct l2cap_chan *chan,
struct l2cap_ctrl *control)
{
BT_DBG("chan %p, control %p", chan, control);
BT_DBG("chan %pK, control %pK", chan, control);
l2cap_tx(chan, control, NULL, L2CAP_EV_RECV_REQSEQ_AND_FBIT);
}
static void l2cap_pass_to_tx_fbit(struct l2cap_chan *chan,
struct l2cap_ctrl *control)
{
BT_DBG("chan %p, control %p", chan, control);
BT_DBG("chan %pK, control %pK", chan, control);
l2cap_tx(chan, control, NULL, L2CAP_EV_RECV_FBIT);
}
@ -2868,7 +2868,7 @@ static void l2cap_raw_recv(struct l2cap_conn *conn, struct sk_buff *skb)
struct sk_buff *nskb;
struct l2cap_chan *chan;
BT_DBG("conn %p", conn);
BT_DBG("conn %pK", conn);
mutex_lock(&conn->chan_lock);
@ -2900,7 +2900,7 @@ static struct sk_buff *l2cap_build_cmd(struct l2cap_conn *conn, u8 code,
struct l2cap_hdr *lh;
int len, count;
BT_DBG("conn %p, code 0x%2.2x, ident 0x%2.2x, len %u",
BT_DBG("conn %pK, code 0x%2.2x, ident 0x%2.2x, len %u",
conn, code, ident, dlen);
if (conn->mtu < L2CAP_HDR_SIZE + L2CAP_CMD_HDR_SIZE)
@ -3059,7 +3059,7 @@ static void l2cap_ack_timeout(struct work_struct *work)
ack_timer.work);
u16 frames_to_ack;
BT_DBG("chan %p", chan);
BT_DBG("chan %pK", chan);
l2cap_chan_lock(chan);
@ -3201,7 +3201,7 @@ static int l2cap_build_conf_req(struct l2cap_chan *chan, void *data)
void *ptr = req->data;
u16 size;
BT_DBG("chan %p", chan);
BT_DBG("chan %pK", chan);
if (chan->num_conf_req || chan->num_conf_rsp)
goto done;
@ -3327,7 +3327,7 @@ static int l2cap_parse_conf_req(struct l2cap_chan *chan, void *data)
u16 result = L2CAP_CONF_SUCCESS;
u16 size;
BT_DBG("chan %p", chan);
BT_DBG("chan %pK", chan);
while (len >= L2CAP_CONF_OPT_SIZE) {
len -= l2cap_get_conf_opt(&req, &type, &olen, &val);
@ -3536,7 +3536,7 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
struct l2cap_conf_rfc rfc = { .mode = L2CAP_MODE_BASIC };
struct l2cap_conf_efs efs;
BT_DBG("chan %p, rsp %p, len %d, req %p", chan, rsp, len, data);
BT_DBG("chan %pK, rsp %pK, len %d, req %pK", chan, rsp, len, data);
while (len >= L2CAP_CONF_OPT_SIZE) {
len -= l2cap_get_conf_opt(&rsp, &type, &olen, &val);
@ -3641,7 +3641,7 @@ static int l2cap_build_conf_rsp(struct l2cap_chan *chan, void *data,
struct l2cap_conf_rsp *rsp = data;
void *ptr = rsp->data;
BT_DBG("chan %p", chan);
BT_DBG("chan %pK", chan);
rsp->scid = cpu_to_le16(chan->dcid);
rsp->result = cpu_to_le16(result);
@ -3669,7 +3669,7 @@ void __l2cap_connect_rsp_defer(struct l2cap_chan *chan)
l2cap_chan_check_security(chan);
BT_DBG("chan %p rsp_code %u", chan, rsp_code);
BT_DBG("chan %pK rsp_code %u", chan, rsp_code);
l2cap_send_cmd(conn, chan->ident, rsp_code, sizeof(rsp), &rsp);
@ -3697,7 +3697,7 @@ static void l2cap_conf_rfc_get(struct l2cap_chan *chan, void *rsp, int len)
.txwin_size = min_t(u16, chan->ack_win, L2CAP_DEFAULT_TX_WINDOW),
};
BT_DBG("chan %p, rsp %p, len %d", chan, rsp, len);
BT_DBG("chan %pK, rsp %pK, len %d", chan, rsp, len);
if ((chan->mode != L2CAP_MODE_ERTM) && (chan->mode != L2CAP_MODE_STREAMING))
return;
@ -4002,7 +4002,7 @@ static void l2cap_send_efs_conf_rsp(struct l2cap_chan *chan, void *data,
{
struct l2cap_conn *conn = chan->conn;
BT_DBG("conn %p chan %p ident %d flags 0x%4.4x", conn, chan, ident,
BT_DBG("conn %pK chan %pK ident %d flags 0x%4.4x", conn, chan, ident,
flags);
clear_bit(CONF_LOC_CONF_PEND, &chan->conf_state);
@ -4496,7 +4496,8 @@ static int l2cap_create_channel_req(struct l2cap_conn *conn,
return -EFAULT;
}
BT_DBG("mgr %p bredr_chan %p hs_hcon %p", mgr, chan, hs_hcon);
BT_DBG("mgr %pK bredr_chan %pK hs_hcon %pK",
mgr, chan, hs_hcon);
mgr->bredr_chan = chan;
chan->hs_hcon = hs_hcon;
@ -4525,7 +4526,7 @@ static void l2cap_send_move_chan_req(struct l2cap_chan *chan, u8 dest_amp_id)
struct l2cap_move_chan_req req;
u8 ident;
BT_DBG("chan %p, dest_amp_id %d", chan, dest_amp_id);
BT_DBG("chan %pK, dest_amp_id %d", chan, dest_amp_id);
ident = l2cap_get_ident(chan->conn);
chan->ident = ident;
@ -4543,7 +4544,7 @@ static void l2cap_send_move_chan_rsp(struct l2cap_chan *chan, u16 result)
{
struct l2cap_move_chan_rsp rsp;
BT_DBG("chan %p, result 0x%4.4x", chan, result);
BT_DBG("chan %pK, result 0x%4.4x", chan, result);
rsp.icid = cpu_to_le16(chan->dcid);
rsp.result = cpu_to_le16(result);
@ -4556,7 +4557,7 @@ static void l2cap_send_move_chan_cfm(struct l2cap_chan *chan, u16 result)
{
struct l2cap_move_chan_cfm cfm;
BT_DBG("chan %p, result 0x%4.4x", chan, result);
BT_DBG("chan %pK, result 0x%4.4x", chan, result);
chan->ident = l2cap_get_ident(chan->conn);
@ -4573,7 +4574,7 @@ static void l2cap_send_move_chan_cfm_icid(struct l2cap_conn *conn, u16 icid)
{
struct l2cap_move_chan_cfm cfm;
BT_DBG("conn %p, icid 0x%4.4x", conn, icid);
BT_DBG("conn %pK, icid 0x%4.4x", conn, icid);
cfm.icid = cpu_to_le16(icid);
cfm.result = __constant_cpu_to_le16(L2CAP_MC_UNCONFIRMED);
@ -4693,7 +4694,7 @@ static void l2cap_logical_finish_move(struct l2cap_chan *chan,
void l2cap_logical_cfm(struct l2cap_chan *chan, struct hci_chan *hchan,
u8 status)
{
BT_DBG("chan %p, hchan %p, status %d", chan, hchan, status);
BT_DBG("chan %pK, hchan %pK, status %d", chan, hchan, status);
if (status) {
l2cap_logical_fail(chan);
@ -4712,7 +4713,7 @@ void l2cap_logical_cfm(struct l2cap_chan *chan, struct hci_chan *hchan,
void l2cap_move_start(struct l2cap_chan *chan)
{
BT_DBG("chan %p", chan);
BT_DBG("chan %pK", chan);
if (chan->local_amp_id == HCI_BREDR_ID) {
if (chan->chan_policy != BT_CHANNEL_POLICY_AMP_PREFERRED)
@ -4732,7 +4733,7 @@ void l2cap_move_start(struct l2cap_chan *chan)
static void l2cap_do_create(struct l2cap_chan *chan, int result,
u8 local_amp_id, u8 remote_amp_id)
{
BT_DBG("chan %p state %s %u -> %u", chan, state_to_string(chan->state),
BT_DBG("chan %pK state %s %u -> %u", chan, state_to_string(chan->state),
local_amp_id, remote_amp_id);
chan->fcs = L2CAP_FCS_NONE;
@ -4841,7 +4842,7 @@ void __l2cap_physical_cfm(struct l2cap_chan *chan, int result)
u8 local_amp_id = chan->local_amp_id;
u8 remote_amp_id = chan->remote_amp_id;
BT_DBG("chan %p, result %d, local_amp_id %d, remote_amp_id %d",
BT_DBG("chan %pK, result %d, local_amp_id %d, remote_amp_id %d",
chan, result, local_amp_id, remote_amp_id);
if (chan->state == BT_DISCONN || chan->state == BT_CLOSED) {
@ -5423,7 +5424,7 @@ static void l2cap_send_i_or_rr_or_rnr(struct l2cap_chan *chan)
{
struct l2cap_ctrl control;
BT_DBG("chan %p", chan);
BT_DBG("chan %pK", chan);
memset(&control, 0, sizeof(control));
control.sframe = 1;
@ -5578,7 +5579,7 @@ static int l2cap_rx_queued_iframes(struct l2cap_chan *chan)
* until a gap is encountered.
*/
BT_DBG("chan %p", chan);
BT_DBG("chan %pK", chan);
while (!test_bit(CONN_LOCAL_BUSY, &chan->conn_state)) {
struct sk_buff *skb;
@ -5610,7 +5611,7 @@ static void l2cap_handle_srej(struct l2cap_chan *chan,
{
struct sk_buff *skb;
BT_DBG("chan %p, control %p", chan, control);
BT_DBG("chan %pK, control %pK", chan, control);
if (control->reqseq == chan->next_tx_seq) {
BT_DBG("Invalid reqseq %d, disconnecting", control->reqseq);
@ -5668,7 +5669,7 @@ static void l2cap_handle_rej(struct l2cap_chan *chan,
{
struct sk_buff *skb;
BT_DBG("chan %p, control %p", chan, control);
BT_DBG("chan %pK, control %pK", chan, control);
if (control->reqseq == chan->next_tx_seq) {
BT_DBG("Invalid reqseq %d, disconnecting", control->reqseq);
@ -5702,7 +5703,7 @@ static void l2cap_handle_rej(struct l2cap_chan *chan,
static u8 l2cap_classify_txseq(struct l2cap_chan *chan, u16 txseq)
{
BT_DBG("chan %p, txseq %d", chan, txseq);
BT_DBG("chan %pK, txseq %d", chan, txseq);
BT_DBG("last_acked_seq %d, expected_tx_seq %d", chan->last_acked_seq,
chan->expected_tx_seq);
@ -5793,7 +5794,7 @@ static int l2cap_rx_state_recv(struct l2cap_chan *chan,
int err = 0;
bool skb_in_use = 0;
BT_DBG("chan %p, control %p, skb %p, event %d", chan, control, skb,
BT_DBG("chan %pK, control %pK, skb %pK, event %d", chan, control, skb,
event);
switch (event) {
@ -5849,7 +5850,7 @@ static int l2cap_rx_state_recv(struct l2cap_chan *chan,
*/
skb_queue_tail(&chan->srej_q, skb);
skb_in_use = 1;
BT_DBG("Queued %p (queue len %d)", skb,
BT_DBG("Queued %pK (queue len %d)", skb,
skb_queue_len(&chan->srej_q));
clear_bit(CONN_SREJ_ACT, &chan->conn_state);
@ -5913,7 +5914,7 @@ static int l2cap_rx_state_recv(struct l2cap_chan *chan,
}
if (skb && !skb_in_use) {
BT_DBG("Freeing %p", skb);
BT_DBG("Freeing %pK", skb);
kfree_skb(skb);
}
@ -5928,7 +5929,7 @@ static int l2cap_rx_state_srej_sent(struct l2cap_chan *chan,
u16 txseq = control->txseq;
bool skb_in_use = 0;
BT_DBG("chan %p, control %p, skb %p, event %d", chan, control, skb,
BT_DBG("chan %pK, control %pK, skb %pK, event %d", chan, control, skb,
event);
switch (event) {
@ -5939,7 +5940,7 @@ static int l2cap_rx_state_srej_sent(struct l2cap_chan *chan,
l2cap_pass_to_tx(chan, control);
skb_queue_tail(&chan->srej_q, skb);
skb_in_use = 1;
BT_DBG("Queued %p (queue len %d)", skb,
BT_DBG("Queued %pK (queue len %d)", skb,
skb_queue_len(&chan->srej_q));
chan->expected_tx_seq = __next_seq(chan, txseq);
@ -5950,7 +5951,7 @@ static int l2cap_rx_state_srej_sent(struct l2cap_chan *chan,
l2cap_pass_to_tx(chan, control);
skb_queue_tail(&chan->srej_q, skb);
skb_in_use = 1;
BT_DBG("Queued %p (queue len %d)", skb,
BT_DBG("Queued %pK (queue len %d)", skb,
skb_queue_len(&chan->srej_q));
err = l2cap_rx_queued_iframes(chan);
@ -5965,7 +5966,7 @@ static int l2cap_rx_state_srej_sent(struct l2cap_chan *chan,
*/
skb_queue_tail(&chan->srej_q, skb);
skb_in_use = 1;
BT_DBG("Queued %p (queue len %d)", skb,
BT_DBG("Queued %pK (queue len %d)", skb,
skb_queue_len(&chan->srej_q));
l2cap_pass_to_tx(chan, control);
@ -5979,7 +5980,7 @@ static int l2cap_rx_state_srej_sent(struct l2cap_chan *chan,
*/
skb_queue_tail(&chan->srej_q, skb);
skb_in_use = 1;
BT_DBG("Queued %p (queue len %d)", skb,
BT_DBG("Queued %pK (queue len %d)", skb,
skb_queue_len(&chan->srej_q));
l2cap_pass_to_tx(chan, control);
@ -6056,7 +6057,7 @@ static int l2cap_rx_state_srej_sent(struct l2cap_chan *chan,
}
if (skb && !skb_in_use) {
BT_DBG("Freeing %p", skb);
BT_DBG("Freeing %pK", skb);
kfree_skb(skb);
}
@ -6065,7 +6066,7 @@ static int l2cap_rx_state_srej_sent(struct l2cap_chan *chan,
static int l2cap_finish_move(struct l2cap_chan *chan)
{
BT_DBG("chan %p", chan);
BT_DBG("chan %pK", chan);
chan->rx_state = L2CAP_RX_STATE_RECV;
@ -6083,7 +6084,7 @@ static int l2cap_rx_state_wait_p(struct l2cap_chan *chan,
{
int err;
BT_DBG("chan %p, control %p, skb %p, event %d", chan, control, skb,
BT_DBG("chan %pK, control %pK, skb %pK, event %d", chan, control, skb,
event);
if (!control->poll)
@ -6167,7 +6168,7 @@ static int l2cap_rx(struct l2cap_chan *chan, struct l2cap_ctrl *control,
{
int err = 0;
BT_DBG("chan %p, control %p, skb %p, event %d, state %d", chan,
BT_DBG("chan %pK, control %pK, skb %pK, event %d, state %d", chan,
control, skb, event, chan->rx_state);
if (__valid_reqseq(chan, control->reqseq)) {
@ -6204,7 +6205,7 @@ static int l2cap_stream_rx(struct l2cap_chan *chan, struct l2cap_ctrl *control,
{
int err = 0;
BT_DBG("chan %p, control %p, skb %p, state %d", chan, control, skb,
BT_DBG("chan %pK, control %pK, skb %pK, state %d", chan, control, skb,
chan->rx_state);
if (l2cap_classify_txseq(chan, control->txseq) ==
@ -6226,7 +6227,7 @@ static int l2cap_stream_rx(struct l2cap_chan *chan, struct l2cap_ctrl *control,
chan->sdu_len = 0;
if (skb) {
BT_DBG("Freeing %p", skb);
BT_DBG("Freeing %pK", skb);
kfree_skb(skb);
}
}
@ -6348,7 +6349,7 @@ static void l2cap_data_channel(struct l2cap_conn *conn, u16 cid,
}
}
BT_DBG("chan %p, len %d", chan, skb->len);
BT_DBG("chan %pK, len %d", chan, skb->len);
if (chan->state != BT_CONNECTED)
goto drop;
@ -6373,7 +6374,7 @@ static void l2cap_data_channel(struct l2cap_conn *conn, u16 cid,
goto done;
default:
BT_DBG("chan %p: bad mode 0x%2.2x", chan, chan->mode);
BT_DBG("chan %pK: bad mode 0x%2.2x", chan, chan->mode);
break;
}
@ -6393,7 +6394,7 @@ static void l2cap_conless_channel(struct l2cap_conn *conn, __le16 psm,
if (!chan)
goto drop;
BT_DBG("chan %p, len %d", chan, skb->len);
BT_DBG("chan %pK, len %d", chan, skb->len);
if (chan->state != BT_BOUND && chan->state != BT_CONNECTED)
goto drop;
@ -6418,7 +6419,7 @@ static void l2cap_att_channel(struct l2cap_conn *conn,
if (!chan)
goto drop;
BT_DBG("chan %p, len %d", chan, skb->len);
BT_DBG("chan %pK, len %d", chan, skb->len);
if (chan->state != BT_BOUND && chan->state != BT_CONNECTED)
goto drop;
@ -6514,7 +6515,7 @@ void l2cap_connect_cfm(struct hci_conn *hcon, u8 status)
{
struct l2cap_conn *conn;
BT_DBG("hcon %p bdaddr %pMR status %d", hcon, &hcon->dst, status);
BT_DBG("hcon %pK bdaddr %pMR status %d", hcon, &hcon->dst, status);
if (!status) {
conn = l2cap_conn_add(hcon);
@ -6529,7 +6530,7 @@ int l2cap_disconn_ind(struct hci_conn *hcon)
{
struct l2cap_conn *conn = hcon->l2cap_data;
BT_DBG("hcon %p", hcon);
BT_DBG("hcon %pK", hcon);
if (!conn)
return HCI_ERROR_REMOTE_USER_TERM;
@ -6538,7 +6539,7 @@ int l2cap_disconn_ind(struct hci_conn *hcon)
void l2cap_disconn_cfm(struct hci_conn *hcon, u8 reason)
{
BT_DBG("hcon %p reason %d", hcon, reason);
BT_DBG("hcon %pK reason %d", hcon, reason);
l2cap_conn_del(hcon, bt_to_errno(reason));
}
@ -6567,7 +6568,7 @@ int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt)
if (!conn)
return 0;
BT_DBG("conn %p status 0x%2.2x encrypt %u", conn, status, encrypt);
BT_DBG("conn %pK status 0x%2.2x encrypt %u", conn, status, encrypt);
if (hcon->type == LE_LINK) {
if (!status && encrypt)
@ -6580,7 +6581,7 @@ int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt)
list_for_each_entry(chan, &conn->chan_l, list) {
l2cap_chan_lock(chan);
BT_DBG("chan %p scid 0x%4.4x state %s", chan, chan->scid,
BT_DBG("chan %pK scid 0x%4.4x state %s", chan, chan->scid,
state_to_string(chan->state));
if (chan->chan_type == L2CAP_CHAN_CONN_FIX_A2MP) {
@ -6691,7 +6692,7 @@ int l2cap_recv_acldata(struct hci_conn *hcon, struct sk_buff *skb, u16 flags)
if (!conn)
goto drop;
BT_DBG("conn %p len %d flags 0x%x", conn, skb->len, flags);
BT_DBG("conn %pK len %d flags 0x%x", conn, skb->len, flags);
switch (flags) {
case ACL_START:

38
net/bluetooth/l2cap_sock.c
View File

@ -56,7 +56,7 @@ static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
struct sockaddr_l2 la;
int len, err = 0;
BT_DBG("sk %p", sk);
BT_DBG("sk %pK", sk);
if (!addr || addr->sa_family != AF_BLUETOOTH)
return -EINVAL;
@ -123,7 +123,7 @@ static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr,
struct sockaddr_l2 la;
int len, err = 0;
BT_DBG("sk %p", sk);
BT_DBG("sk %pK", sk);
if (!addr || alen < sizeof(addr->sa_family) ||
addr->sa_family != AF_BLUETOOTH)
@ -157,7 +157,7 @@ static int l2cap_sock_listen(struct socket *sock, int backlog)
struct l2cap_chan *chan = l2cap_pi(sk)->chan;
int err = 0;
BT_DBG("sk %p backlog %d", sk, backlog);
BT_DBG("sk %pK backlog %d", sk, backlog);
lock_sock(sk);
@ -207,7 +207,7 @@ static int l2cap_sock_accept(struct socket *sock, struct socket *newsock,
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);
@ -245,7 +245,7 @@ static int l2cap_sock_accept(struct socket *sock, struct socket *newsock,
newsock->state = SS_CONNECTED;
BT_DBG("new socket %p", nsk);
BT_DBG("new socket %pK", nsk);
done:
release_sock(sk);
@ -259,7 +259,7 @@ static int l2cap_sock_getname(struct socket *sock, struct sockaddr *addr,
struct sock *sk = sock->sk;
struct l2cap_chan *chan = l2cap_pi(sk)->chan;
BT_DBG("sock %p, sk %p", sock, sk);
BT_DBG("sock %pK, sk %pK", sock, sk);
memset(la, 0, sizeof(struct sockaddr_l2));
addr->sa_family = AF_BLUETOOTH;
@ -290,7 +290,7 @@ static int l2cap_sock_getsockopt_old(struct socket *sock, int optname,
int len, err = 0;
u32 opt;
BT_DBG("sk %p", sk);
BT_DBG("sk %pK", sk);
if (get_user(len, optlen))
return -EFAULT;
@ -377,7 +377,7 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname,
struct bt_power pwr;
int len, err = 0;
BT_DBG("sk %p", sk);
BT_DBG("sk %pK", sk);
if (level == SOL_L2CAP)
return l2cap_sock_getsockopt_old(sock, optname, optval, optlen);
@ -492,7 +492,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
int len, err = 0;
u32 opt;
BT_DBG("sk %p", sk);
BT_DBG("sk %pK", sk);
lock_sock(sk);
@ -594,7 +594,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
int len, err = 0;
u32 opt;
BT_DBG("sk %p", sk);
BT_DBG("sk %pK", sk);
if (level == SOL_L2CAP)
return l2cap_sock_setsockopt_old(sock, optname, optval, optlen);
@ -769,7 +769,7 @@ static int l2cap_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
struct l2cap_chan *chan = l2cap_pi(sk)->chan;
int err;
BT_DBG("sock %p, sk %p", sock, sk);
BT_DBG("sock %pK, sk %pK", sock, sk);
err = sock_error(sk);
if (err)
@ -851,7 +851,7 @@ static void l2cap_sock_kill(struct sock *sk)
if (!sock_flag(sk, SOCK_ZAPPED) || sk->sk_socket)
return;
BT_DBG("sk %p state %s", sk, state_to_string(sk->sk_state));
BT_DBG("sk %pK state %s", sk, state_to_string(sk->sk_state));
/* Kill poor orphan */
@ -867,7 +867,7 @@ static int l2cap_sock_shutdown(struct socket *sock, int how)
struct l2cap_conn *conn;
int err = 0;
BT_DBG("sock %p, sk %p", sock, sk);
BT_DBG("sock %pK, sk %pK", sock, sk);
if (!sk)
return 0;
@ -925,7 +925,7 @@ static int l2cap_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;
@ -943,7 +943,7 @@ static void l2cap_sock_cleanup_listen(struct sock *parent)
{
struct sock *sk;
BT_DBG("parent %p", parent);
BT_DBG("parent %pK", parent);
/* Close not yet accepted channels */
while ((sk = bt_accept_dequeue(parent, NULL))) {
@ -1104,7 +1104,7 @@ static void l2cap_sock_ready_cb(struct l2cap_chan *chan)
parent = bt_sk(sk)->parent;
BT_DBG("sk %p, parent %p", sk, parent);
BT_DBG("sk %pK, parent %pK", sk, parent);
sk->sk_state = BT_CONNECTED;
sk->sk_state_change(sk);
@ -1138,7 +1138,7 @@ static struct l2cap_ops l2cap_chan_ops = {
static void l2cap_sock_destruct(struct sock *sk)
{
BT_DBG("sk %p", sk);
BT_DBG("sk %pK", sk);
if (l2cap_pi(sk)->chan)
l2cap_chan_put(l2cap_pi(sk)->chan);
@ -1156,7 +1156,7 @@ static void l2cap_sock_init(struct sock *sk, struct sock *parent)
struct l2cap_pinfo *pi = l2cap_pi(sk);
struct l2cap_chan *chan = pi->chan;
BT_DBG("sk %p", sk);
BT_DBG("sk %pK", sk);
if (parent) {
struct l2cap_chan *pchan = l2cap_pi(parent)->chan;
@ -1258,7 +1258,7 @@ static int l2cap_sock_create(struct net *net, struct socket *sock, int protocol,
{
struct sock *sk;
BT_DBG("sock %p", sock);
BT_DBG("sock %pK", sock);
sock->state = SS_UNCONNECTED;

4
net/bluetooth/lib.c
View File

@ -145,7 +145,7 @@ int bt_info(const char *format, ...)
vaf.fmt = format;
vaf.va = &args;
r = pr_info("%pV", &vaf);
r = pr_info("%pKV", &vaf);
va_end(args);
@ -164,7 +164,7 @@ int bt_err(const char *format, ...)
vaf.fmt = format;
vaf.va = &args;
r = pr_err("%pV", &vaf);
r = pr_err("%pKV", &vaf);
va_end(args);

12
net/bluetooth/mgmt.c
View File

@ -213,7 +213,7 @@ static int cmd_status(struct sock *sk, u16 index, u16 cmd, u8 status)
struct mgmt_ev_cmd_status *ev;
int err;
BT_DBG("sock %p, index %u, cmd %u, status %u", sk, index, cmd, status);
BT_DBG("sock %pK, index %u, cmd %u, status %u", sk, index, cmd, status);
skb = alloc_skb(sizeof(*hdr) + sizeof(*ev), GFP_KERNEL);
if (!skb)
@ -244,7 +244,7 @@ static int cmd_complete(struct sock *sk, u16 index, u16 cmd, u8 status,
struct mgmt_ev_cmd_complete *ev;
int err;
BT_DBG("sock %p", sk);
BT_DBG("sock %pK", sk);
skb = alloc_skb(sizeof(*hdr) + sizeof(*ev) + rp_len, GFP_KERNEL);
if (!skb)
@ -275,7 +275,7 @@ static int read_version(struct sock *sk, struct hci_dev *hdev, void *data,
{
struct mgmt_rp_read_version rp;
BT_DBG("sock %p", sk);
BT_DBG("sock %pK", sk);
rp.version = MGMT_VERSION;
rp.revision = __constant_cpu_to_le16(MGMT_REVISION);
@ -294,7 +294,7 @@ static int read_commands(struct sock *sk, struct hci_dev *hdev, void *data,
size_t rp_size;
int i, err;
BT_DBG("sock %p", sk);
BT_DBG("sock %pK", sk);
rp_size = sizeof(*rp) + ((num_commands + num_events) * sizeof(u16));
@ -327,7 +327,7 @@ static int read_index_list(struct sock *sk, struct hci_dev *hdev, void *data,
u16 count;
int err;
BT_DBG("sock %p", sk);
BT_DBG("sock %pK", sk);
read_lock(&hci_dev_list_lock);
@ -698,7 +698,7 @@ static int read_controller_info(struct sock *sk, struct hci_dev *hdev,
{
struct mgmt_rp_read_info rp;
BT_DBG("sock %p %s", sk, hdev->name);
BT_DBG("sock %pK %s", sk, hdev->name);
hci_dev_lock(hdev);

128
net/bluetooth/rfcomm/core.c
View File

@ -182,13 +182,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, int bytes)
{
BT_DBG("%p bytes %d", sk, bytes);
BT_DBG("%pK bytes %d", sk, bytes);
rfcomm_schedule();
}
@ -233,7 +233,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();
@ -241,14 +241,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);
}
@ -258,7 +258,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);
@ -267,7 +267,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);
@ -275,7 +275,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);
@ -283,7 +283,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;
@ -311,14 +311,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);
@ -326,7 +326,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);
@ -338,7 +338,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;
@ -365,7 +365,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 (channel < 1 || channel > 30)
@ -431,8 +431,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:
@ -484,7 +484,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();
@ -519,7 +519,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;
@ -534,7 +534,7 @@ int rfcomm_dlc_send(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;
@ -545,7 +545,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;
@ -561,8 +561,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;
@ -579,8 +579,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;
@ -594,7 +594,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);
@ -622,7 +622,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);
@ -660,7 +660,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) {
@ -744,7 +744,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));
@ -753,7 +753,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));
}
@ -762,7 +762,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);
@ -776,7 +776,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);
@ -790,7 +790,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);
@ -805,7 +805,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)
@ -826,7 +826,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);
@ -842,7 +842,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);
@ -868,7 +868,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);
@ -913,10 +913,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);
@ -948,7 +947,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);
@ -975,7 +974,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);
@ -1001,7 +1000,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);
@ -1023,7 +1022,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);
@ -1049,7 +1048,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);
@ -1076,7 +1075,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;
@ -1113,7 +1112,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 */
@ -1167,7 +1166,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 */
@ -1197,7 +1196,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);
@ -1232,7 +1231,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);
@ -1273,7 +1272,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);
@ -1314,8 +1313,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) {
@ -1345,7 +1344,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;
@ -1561,7 +1560,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);
@ -1616,7 +1615,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) {
@ -1718,7 +1717,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);
@ -1742,8 +1741,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))
@ -1790,7 +1789,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);
@ -1851,7 +1850,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))) {
@ -1881,7 +1881,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)
@ -1907,7 +1907,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:
@ -2062,7 +2062,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)

47
net/bluetooth/rfcomm/sock.c
View File

@ -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);
@ -150,7 +150,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);
@ -170,7 +170,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))) {
@ -190,7 +190,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);
@ -202,7 +203,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:
@ -235,7 +236,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;
@ -300,7 +301,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;
}
@ -309,7 +310,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;
@ -332,7 +333,7 @@ static int rfcomm_sock_bind(struct socket *sock, struct sockaddr *addr, int addr
struct sock *sk = sock->sk;
int err = 0;
BT_DBG("sk %p %pMR", sk, &sa->rc_bdaddr);
BT_DBG("sk %pK %pMR", sk, &sa->rc_bdaddr);
if (!addr || addr->sa_family != AF_BLUETOOTH)
return -EINVAL;
@ -374,7 +375,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)
@ -414,7 +415,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);
@ -474,7 +475,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);
@ -512,7 +513,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);
@ -524,7 +525,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);
memset(sa, 0, sizeof(*sa));
sa->rc_family = AF_BLUETOOTH;
@ -555,7 +556,7 @@ static int rfcomm_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
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);
@ -630,7 +631,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);
@ -668,7 +669,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);
@ -736,7 +737,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;
@ -800,7 +801,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);
@ -855,7 +856,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);
@ -877,7 +878,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;
@ -900,7 +901,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;
@ -922,7 +923,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);

50
net/bluetooth/rfcomm/tty.c
View File

@ -88,7 +88,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);
/* Refcount should only hit zero when called from rfcomm_dev_del()
which will have taken us off the list. Everything else are
@ -304,7 +304,7 @@ free:
static void rfcomm_dev_del(struct rfcomm_dev *dev)
{
unsigned long flags;
BT_DBG("dev %p", dev);
BT_DBG("dev %pK", dev);
BUG_ON(test_and_set_bit(RFCOMM_TTY_RELEASED, &dev->flags));
@ -373,7 +373,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;
@ -518,7 +518,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:
@ -552,7 +552,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);
@ -566,7 +566,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;
wake_up_interruptible(&dev->wait);
@ -602,7 +602,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)) {
if (dev->port.tty && !C_CLOCAL(dev->port.tty))
@ -622,7 +622,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);
@ -648,7 +648,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
id = tty->index;
BT_DBG("tty %p id %d", tty, id);
BT_DBG("tty %pK id %d", tty, id);
/* We don't leak this refcount. For reasons which are not entirely
clear, the TTY layer will call our ->close() method even if the
@ -658,7 +658,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
if (!dev)
return -ENODEV;
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);
spin_lock_irqsave(&dev->port.lock, flags);
@ -726,8 +726,8 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
if (!dev)
return;
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);
spin_lock_irqsave(&dev->port.lock, flags);
if (!--dev->port.count) {
@ -765,7 +765,7 @@ static int rfcomm_tty_write(struct tty_struct *tty, const unsigned char *buf, in
struct sk_buff *skb;
int err = 0, 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);
@ -797,7 +797,7 @@ static int rfcomm_tty_write_room(struct tty_struct *tty)
struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
int room;
BT_DBG("tty %p", tty);
BT_DBG("tty %pK", tty);
if (!dev || !dev->dlc)
return 0;
@ -811,7 +811,7 @@ static int rfcomm_tty_write_room(struct tty_struct *tty)
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:
@ -865,7 +865,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;
@ -997,7 +997,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);
}
@ -1006,7 +1006,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);
}
@ -1015,7 +1015,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;
@ -1030,7 +1030,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;
@ -1041,19 +1041,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);
if (!dev)
return;
@ -1072,7 +1072,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;
}
@ -1083,7 +1083,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);

64
net/bluetooth/sco.c
View File

@ -51,7 +51,7 @@ static void sco_sock_timeout(unsigned long arg)
{
struct sock *sk = (struct sock *) arg;
BT_DBG("sock %p state %d", sk, sk->sk_state);
BT_DBG("sock %pK state %d", sk, sk->sk_state);
bh_lock_sock(sk);
sk->sk_err = ETIMEDOUT;
@ -64,13 +64,13 @@ static void sco_sock_timeout(unsigned long arg)
static void sco_sock_set_timer(struct sock *sk, long timeout)
{
BT_DBG("sock %p state %d timeout %ld", sk, sk->sk_state, timeout);
BT_DBG("sock %pK state %d timeout %ld", sk, sk->sk_state, timeout);
sk_reset_timer(sk, &sk->sk_timer, jiffies + timeout);
}
static void sco_sock_clear_timer(struct sock *sk)
{
BT_DBG("sock %p state %d", sk, sk->sk_state);
BT_DBG("sock %pK state %d", sk, sk->sk_state);
sk_stop_timer(sk, &sk->sk_timer);
}
@ -100,7 +100,7 @@ static struct sco_conn *sco_conn_add(struct hci_conn *hcon)
else
conn->mtu = 60;
BT_DBG("hcon %p conn %p", hcon, conn);
BT_DBG("hcon %pK conn %pK", hcon, conn);
return conn;
}
@ -122,7 +122,7 @@ static int sco_conn_del(struct hci_conn *hcon, int err)
if (!conn)
return 0;
BT_DBG("hcon %p conn %p, err %d", hcon, conn, err);
BT_DBG("hcon %pK conn %pK, err %d", hcon, conn, err);
/* Kill socket */
sk = sco_chan_get(conn);
@ -224,7 +224,7 @@ static int sco_send_frame(struct sock *sk, struct msghdr *msg, int len)
if (len > conn->mtu)
return -EINVAL;
BT_DBG("sk %p len %d", sk, len);
BT_DBG("sk %pK len %d", sk, len);
skb = bt_skb_send_alloc(sk, len, msg->msg_flags & MSG_DONTWAIT, &err);
if (!skb)
@ -247,7 +247,7 @@ static void sco_recv_frame(struct sco_conn *conn, struct sk_buff *skb)
if (!sk)
goto drop;
BT_DBG("sk %p len %d", sk, skb->len);
BT_DBG("sk %pK len %d", sk, skb->len);
if (sk->sk_state != BT_CONNECTED)
goto drop;
@ -304,7 +304,7 @@ static struct sock *sco_get_sock_listen(bdaddr_t *src)
static void sco_sock_destruct(struct sock *sk)
{
BT_DBG("sk %p", sk);
BT_DBG("sk %pK", sk);
skb_queue_purge(&sk->sk_receive_queue);
skb_queue_purge(&sk->sk_write_queue);
@ -314,7 +314,7 @@ static void sco_sock_cleanup_listen(struct sock *parent)
{
struct sock *sk;
BT_DBG("parent %p", parent);
BT_DBG("parent %pK", parent);
/* Close not yet accepted channels */
while ((sk = bt_accept_dequeue(parent, NULL))) {
@ -334,7 +334,7 @@ static void sco_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 %pK state %d", sk, sk->sk_state);
/* Kill poor orphan */
bt_sock_unlink(&sco_sk_list, sk);
@ -344,7 +344,7 @@ static void sco_sock_kill(struct sock *sk)
static void __sco_sock_close(struct sock *sk)
{
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:
@ -388,7 +388,7 @@ static void sco_sock_close(struct sock *sk)
static void sco_sock_init(struct sock *sk, struct sock *parent)
{
BT_DBG("sk %p", sk);
BT_DBG("sk %pK", sk);
if (parent) {
sk->sk_type = parent->sk_type;
@ -433,7 +433,7 @@ static int sco_sock_create(struct net *net, struct socket *sock, int protocol,
{
struct sock *sk;
BT_DBG("sock %p", sock);
BT_DBG("sock %pK", sock);
sock->state = SS_UNCONNECTED;
@ -456,7 +456,7 @@ static int sco_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
struct sock *sk = sock->sk;
int len, err = 0;
BT_DBG("sk %p %pMR", sk, &sa.sco_bdaddr);
BT_DBG("sk %pK %pMR", sk, &sa.sco_bdaddr);
if (!addr || addr->sa_family != AF_BLUETOOTH)
return -EINVAL;
@ -493,7 +493,7 @@ static int sco_sock_connect(struct socket *sock, struct sockaddr *addr, int alen
struct sockaddr_sco sa;
int len, err;
BT_DBG("sk %p", sk);
BT_DBG("sk %pK", sk);
if (!addr || addr->sa_family != AF_BLUETOOTH)
return -EINVAL;
@ -536,7 +536,7 @@ static int sco_sock_listen(struct socket *sock, int backlog)
bdaddr_t *src = &bt_sk(sk)->src;
int err = 0;
BT_DBG("sk %p backlog %d", sk, backlog);
BT_DBG("sk %pK backlog %d", sk, backlog);
lock_sock(sk);
@ -581,7 +581,7 @@ static int sco_sock_accept(struct socket *sock, struct socket *newsock, int flag
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);
@ -619,7 +619,7 @@ static int sco_sock_accept(struct socket *sock, struct socket *newsock, int flag
newsock->state = SS_CONNECTED;
BT_DBG("new socket %p", ch);
BT_DBG("new socket %pK", ch);
done:
release_sock(sk);
@ -631,7 +631,7 @@ static int sco_sock_getname(struct socket *sock, struct sockaddr *addr, int *len
struct sockaddr_sco *sa = (struct sockaddr_sco *) addr;
struct sock *sk = sock->sk;
BT_DBG("sock %p, sk %p", sock, sk);
BT_DBG("sock %pK, sk %pK", sock, sk);
addr->sa_family = AF_BLUETOOTH;
*len = sizeof(struct sockaddr_sco);
@ -651,7 +651,7 @@ static int sco_sock_sendmsg(struct kiocb *iocb, 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);
err = sock_error(sk);
if (err)
@ -675,7 +675,7 @@ static void sco_conn_defer_accept(struct hci_conn *conn, int mask)
{
struct hci_dev *hdev = conn->hdev;
BT_DBG("conn %p", conn);
BT_DBG("conn %pK", conn);
conn->state = BT_CONFIG;
@ -735,7 +735,7 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname, char
int err = 0;
u32 opt;
BT_DBG("sk %p", sk);
BT_DBG("sk %pK", sk);
lock_sock(sk);
@ -774,7 +774,7 @@ static int sco_sock_getsockopt_old(struct socket *sock, int optname, char __user
struct sco_conninfo cinfo;
int len, err = 0;
BT_DBG("sk %p", sk);
BT_DBG("sk %pK", sk);
if (get_user(len, optlen))
return -EFAULT;
@ -828,7 +828,7 @@ static int sco_sock_getsockopt(struct socket *sock, int level, int optname, char
struct sock *sk = sock->sk;
int len, err = 0;
BT_DBG("sk %p", sk);
BT_DBG("sk %pK", sk);
if (level == SOL_SCO)
return sco_sock_getsockopt_old(sock, optname, optval, optlen);
@ -866,7 +866,7 @@ static int sco_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;
@ -891,7 +891,7 @@ static int sco_sock_release(struct socket *sock)
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;
@ -912,7 +912,7 @@ static int sco_sock_release(struct socket *sock)
static void __sco_chan_add(struct sco_conn *conn, struct sock *sk, struct sock *parent)
{
BT_DBG("conn %p", conn);
BT_DBG("conn %pK", conn);
sco_pi(sk)->conn = conn;
conn->sk = sk;
@ -929,7 +929,7 @@ static void sco_chan_del(struct sock *sk, int err)
conn = sco_pi(sk)->conn;
BT_DBG("sk %p, conn %p, err %d", sk, conn, err);
BT_DBG("sk %pK, conn %pK, err %d", sk, conn, err);
if (conn) {
sco_conn_lock(conn);
@ -953,7 +953,7 @@ static void sco_conn_ready(struct sco_conn *conn)
struct sock *parent;
struct sock *sk = conn->sk;
BT_DBG("conn %p", conn);
BT_DBG("conn %pK", conn);
if (sk) {
sco_sock_clear_timer(sk);
@ -1032,7 +1032,7 @@ int sco_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 *flags)
void sco_connect_cfm(struct hci_conn *hcon, __u8 status)
{
BT_DBG("hcon %p bdaddr %pMR status %d", hcon, &hcon->dst, status);
BT_DBG("hcon %pK bdaddr %pMR status %d", hcon, &hcon->dst, status);
if (!status) {
struct sco_conn *conn;
@ -1045,7 +1045,7 @@ void sco_connect_cfm(struct hci_conn *hcon, __u8 status)
void sco_disconn_cfm(struct hci_conn *hcon, __u8 reason)
{
BT_DBG("hcon %p reason %d", hcon, reason);
BT_DBG("hcon %pK reason %d", hcon, reason);
sco_conn_del(hcon, bt_to_errno(reason));
}
@ -1057,7 +1057,7 @@ int sco_recv_scodata(struct hci_conn *hcon, struct sk_buff *skb)
if (!conn)
goto drop;
BT_DBG("conn %p len %d", conn, skb->len);
BT_DBG("conn %pK len %d", conn, skb->len);
if (skb->len) {
sco_recv_frame(conn, skb);

20
net/bluetooth/smp.c
View File

@ -56,7 +56,7 @@ static int smp_e(struct crypto_blkcipher *tfm, const u8 *k, u8 *r)
unsigned char iv[128];
if (tfm == NULL) {
BT_ERR("tfm %p", tfm);
BT_ERR("tfm %pK", tfm);
return -EINVAL;
}
@ -375,7 +375,7 @@ static void confirm_work(struct work_struct *work)
int ret;
u8 res[16], reason;
BT_DBG("conn %p", conn);
BT_DBG("conn %pK", conn);
tfm = crypto_alloc_blkcipher("ecb(aes)", 0, CRYPTO_ALG_ASYNC);
if (IS_ERR(tfm)) {
@ -422,7 +422,7 @@ static void random_work(struct work_struct *work)
goto error;
}
BT_DBG("conn %p %s", conn, conn->hcon->out ? "master" : "slave");
BT_DBG("conn %pK %s", conn, conn->hcon->out ? "master" : "slave");
if (hcon->out)
ret = smp_c1(tfm, smp->tk, smp->rrnd, smp->preq, smp->prsp, 0,
@ -574,7 +574,7 @@ static u8 smp_cmd_pairing_req(struct l2cap_conn *conn, struct sk_buff *skb)
u8 auth = SMP_AUTH_NONE;
int ret;
BT_DBG("conn %p", conn);
BT_DBG("conn %pK", conn);
if (conn->hcon->link_mode & HCI_LM_MASTER)
return SMP_CMD_NOTSUPP;
@ -628,7 +628,7 @@ static u8 smp_cmd_pairing_rsp(struct l2cap_conn *conn, struct sk_buff *skb)
u8 key_size, auth = SMP_AUTH_NONE;
int ret;
BT_DBG("conn %p", conn);
BT_DBG("conn %pK", conn);
if (!(conn->hcon->link_mode & HCI_LM_MASTER))
return SMP_CMD_NOTSUPP;
@ -674,7 +674,7 @@ static u8 smp_cmd_pairing_confirm(struct l2cap_conn *conn, struct sk_buff *skb)
struct smp_chan *smp = conn->smp_chan;
struct hci_dev *hdev = conn->hcon->hdev;
BT_DBG("conn %p %s", conn, conn->hcon->out ? "master" : "slave");
BT_DBG("conn %pK %s", conn, conn->hcon->out ? "master" : "slave");
memcpy(smp->pcnf, skb->data, sizeof(smp->pcnf));
skb_pull(skb, sizeof(smp->pcnf));
@ -699,7 +699,7 @@ static u8 smp_cmd_pairing_random(struct l2cap_conn *conn, struct sk_buff *skb)
struct smp_chan *smp = conn->smp_chan;
struct hci_dev *hdev = conn->hcon->hdev;
BT_DBG("conn %p", conn);
BT_DBG("conn %pK", conn);
swap128(skb->data, smp->rrnd);
skb_pull(skb, sizeof(smp->rrnd));
@ -752,7 +752,7 @@ static u8 smp_cmd_security_req(struct l2cap_conn *conn, struct sk_buff *skb)
struct smp_chan *smp;
u8 sec_level;
BT_DBG("conn %p", conn);
BT_DBG("conn %pK", conn);
sec_level = authreq_to_seclevel(rp->auth_req);
if (smp_sufficient_security(hcon, sec_level))
@ -790,7 +790,7 @@ int smp_conn_security(struct hci_conn *hcon, __u8 sec_level)
struct smp_chan *smp = conn->smp_chan;
__u8 authreq;
BT_DBG("conn %p hcon %p level 0x%2.2x", conn, hcon, sec_level);
BT_DBG("conn %pK hcon %pK level 0x%2.2x", conn, hcon, sec_level);
if (!test_bit(HCI_LE_ENABLED, &hcon->hdev->dev_flags))
return 1;
@ -958,7 +958,7 @@ int smp_distribute_keys(struct l2cap_conn *conn, __u8 force)
struct smp_chan *smp = conn->smp_chan;
__u8 *keydist;
BT_DBG("conn %p force %d", conn, force);
BT_DBG("conn %pK force %d", conn, force);
if (!test_bit(HCI_CONN_LE_SMP_PEND, &conn->hcon->flags))
return 0;