git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
[sfrench/cifs-2.6.git]
/
net
/
bluetooth
/
rfcomm
/
core.c
diff --git
a/net/bluetooth/rfcomm/core.c
b/net/bluetooth/rfcomm/core.c
index 05c609b12a1d7007a811f3176ed546e2b6a64d1e..754b6fe4f742af8ce4662a25065c6caba242295b 100644
(file)
--- a/
net/bluetooth/rfcomm/core.c
+++ b/
net/bluetooth/rfcomm/core.c
@@
-186,9
+186,9
@@
static void rfcomm_l2state_change(struct sock *sk)
rfcomm_schedule();
}
-static void rfcomm_l2data_ready(struct sock *sk
, int bytes
)
+static void rfcomm_l2data_ready(struct sock *sk)
{
- BT_DBG("%p
bytes %d", sk, bytes
);
+ BT_DBG("%p
", sk
);
rfcomm_schedule();
}