mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2025-01-04 04:06:26 +00:00
nfc: do not break pr_debug() call into separate lines
Remove unneeded line break between pr_debug and arguments. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
9eb4c320be
commit
3537e507b6
@ -201,8 +201,7 @@ static void llc_shdlc_reset_t2(struct llc_shdlc *shdlc, int y_nr)
|
|||||||
del_timer_sync(&shdlc->t2_timer);
|
del_timer_sync(&shdlc->t2_timer);
|
||||||
shdlc->t2_active = false;
|
shdlc->t2_active = false;
|
||||||
|
|
||||||
pr_debug
|
pr_debug("All sent frames acked. Stopped T2(retransmit)\n");
|
||||||
("All sent frames acked. Stopped T2(retransmit)\n");
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
skb = skb_peek(&shdlc->ack_pending_q);
|
skb = skb_peek(&shdlc->ack_pending_q);
|
||||||
@ -211,8 +210,7 @@ static void llc_shdlc_reset_t2(struct llc_shdlc *shdlc, int y_nr)
|
|||||||
msecs_to_jiffies(SHDLC_T2_VALUE_MS));
|
msecs_to_jiffies(SHDLC_T2_VALUE_MS));
|
||||||
shdlc->t2_active = true;
|
shdlc->t2_active = true;
|
||||||
|
|
||||||
pr_debug
|
pr_debug("Start T2(retransmit) for remaining unacked sent frames\n");
|
||||||
("Start T2(retransmit) for remaining unacked sent frames\n");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -522,12 +520,11 @@ static void llc_shdlc_handle_send_queue(struct llc_shdlc *shdlc)
|
|||||||
unsigned long time_sent;
|
unsigned long time_sent;
|
||||||
|
|
||||||
if (shdlc->send_q.qlen)
|
if (shdlc->send_q.qlen)
|
||||||
pr_debug
|
pr_debug("sendQlen=%d ns=%d dnr=%d rnr=%s w_room=%d unackQlen=%d\n",
|
||||||
("sendQlen=%d ns=%d dnr=%d rnr=%s w_room=%d unackQlen=%d\n",
|
shdlc->send_q.qlen, shdlc->ns, shdlc->dnr,
|
||||||
shdlc->send_q.qlen, shdlc->ns, shdlc->dnr,
|
shdlc->rnr == false ? "false" : "true",
|
||||||
shdlc->rnr == false ? "false" : "true",
|
shdlc->w - llc_shdlc_w_used(shdlc->ns, shdlc->dnr),
|
||||||
shdlc->w - llc_shdlc_w_used(shdlc->ns, shdlc->dnr),
|
shdlc->ack_pending_q.qlen);
|
||||||
shdlc->ack_pending_q.qlen);
|
|
||||||
|
|
||||||
while (shdlc->send_q.qlen && shdlc->ack_pending_q.qlen < shdlc->w &&
|
while (shdlc->send_q.qlen && shdlc->ack_pending_q.qlen < shdlc->w &&
|
||||||
(shdlc->rnr == false)) {
|
(shdlc->rnr == false)) {
|
||||||
@ -649,8 +646,7 @@ static void llc_shdlc_sm_work(struct work_struct *work)
|
|||||||
llc_shdlc_handle_send_queue(shdlc);
|
llc_shdlc_handle_send_queue(shdlc);
|
||||||
|
|
||||||
if (shdlc->t1_active && timer_pending(&shdlc->t1_timer) == 0) {
|
if (shdlc->t1_active && timer_pending(&shdlc->t1_timer) == 0) {
|
||||||
pr_debug
|
pr_debug("Handle T1(send ack) elapsed (T1 now inactive)\n");
|
||||||
("Handle T1(send ack) elapsed (T1 now inactive)\n");
|
|
||||||
|
|
||||||
shdlc->t1_active = false;
|
shdlc->t1_active = false;
|
||||||
r = llc_shdlc_send_s_frame(shdlc, S_FRAME_RR,
|
r = llc_shdlc_send_s_frame(shdlc, S_FRAME_RR,
|
||||||
@ -660,8 +656,7 @@ static void llc_shdlc_sm_work(struct work_struct *work)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (shdlc->t2_active && timer_pending(&shdlc->t2_timer) == 0) {
|
if (shdlc->t2_active && timer_pending(&shdlc->t2_timer) == 0) {
|
||||||
pr_debug
|
pr_debug("Handle T2(retransmit) elapsed (T2 inactive)\n");
|
||||||
("Handle T2(retransmit) elapsed (T2 inactive)\n");
|
|
||||||
|
|
||||||
shdlc->t2_active = false;
|
shdlc->t2_active = false;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user