projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'ipvs-next/master'
[deliverable/linux.git]
/
net
/
nfc
/
llcp_core.c
diff --git
a/net/nfc/llcp_core.c
b/net/nfc/llcp_core.c
index 98876274a1eea22b709403dde2c5702b1387a0be..e69786c6804cdf83cd5b758bad3985afacb1a4b2 100644
(file)
--- a/
net/nfc/llcp_core.c
+++ b/
net/nfc/llcp_core.c
@@
-732,9
+732,8
@@
static void nfc_llcp_tx_work(struct work_struct *work)
int ret;
pr_debug("Sending pending skb\n");
int ret;
pr_debug("Sending pending skb\n");
- print_hex_dump(KERN_DEBUG, "LLCP Tx: ",
- DUMP_PREFIX_OFFSET, 16, 1,
- skb->data, skb->len, true);
+ print_hex_dump_debug("LLCP Tx: ", DUMP_PREFIX_OFFSET,
+ 16, 1, skb->data, skb->len, true);
if (ptype == LLCP_PDU_DISC && sk != NULL &&
sk->sk_state == LLCP_DISCONNECTING) {
if (ptype == LLCP_PDU_DISC && sk != NULL &&
sk->sk_state == LLCP_DISCONNECTING) {
@@
-1412,8
+1411,8
@@
static void nfc_llcp_rx_skb(struct nfc_llcp_local *local, struct sk_buff *skb)
pr_debug("ptype 0x%x dsap 0x%x ssap 0x%x\n", ptype, dsap, ssap);
if (ptype != LLCP_PDU_SYMM)
pr_debug("ptype 0x%x dsap 0x%x ssap 0x%x\n", ptype, dsap, ssap);
if (ptype != LLCP_PDU_SYMM)
- print_hex_dump
(KERN_DEBUG, "LLCP Rx: ", DUMP_PREFIX_OFFSET
,
-
16, 1,
skb->data, skb->len, true);
+ print_hex_dump
_debug("LLCP Rx: ", DUMP_PREFIX_OFFSET, 16, 1
,
+
skb->data, skb->len, true);
switch (ptype) {
case LLCP_PDU_SYMM:
switch (ptype) {
case LLCP_PDU_SYMM:
This page took
0.026387 seconds
and
5
git commands to generate.