[PATCH] Bluetooth: L2CAP: fix wrong identifier in __set_ack_timer()

[PATCH] Bluetooth: L2CAP: fix wrong identifier in __set_ack_timer()

[Pauli Virtanen]

__set_ack_timer(c) has chan->ack_timer instead of c->ack_timer like the
other macros.

Fix it to use the timer corresponding to the macro argument.  In current
code this is only called as __set_ack_timer(chan) so this has no runtime
impact.

Signed-off-by: Pauli Virtanen <pav@iki.fi>
---

Notes:
    Saw this one in Sashiko trace.

 include/net/bluetooth/l2cap.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 69d193fee351..99c07f1278a0 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -873,8 +873,8 @@ static inline bool l2cap_clear_timer(struct l2cap_chan *chan,
 #define __clear_chan_timer(c) l2cap_clear_timer(c, &c->chan_timer)
 #define __clear_retrans_timer(c) l2cap_clear_timer(c, &c->retrans_timer)
 #define __clear_monitor_timer(c) l2cap_clear_timer(c, &c->monitor_timer)
-#define __set_ack_timer(c) l2cap_set_timer(c, &chan->ack_timer, \
-		msecs_to_jiffies(L2CAP_DEFAULT_ACK_TO));
+#define __set_ack_timer(c) l2cap_set_timer(c, &c->ack_timer, \
+		msecs_to_jiffies(L2CAP_DEFAULT_ACK_TO))
 #define __clear_ack_timer(c) l2cap_clear_timer(c, &c->ack_timer)
 
 static inline int __seq_offset(struct l2cap_chan *chan, __u16 seq1, __u16 seq2)
-- 
2.55.0

RE: Bluetooth: L2CAP: fix wrong identifier in __set_ack_timer()

[bluez.test.bot]

[-- Attachment #1: Type: text/plain, Size: 1235 bytes --]

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=1153633

---Test result---

Test Summary:
CheckPatch                    PASS      0.55 seconds
VerifyFixes                   PASS      0.08 seconds
VerifySignedoff               PASS      0.40 seconds
GitLint                       PASS      0.75 seconds
SubjectPrefix                 PASS      0.07 seconds
BuildKernel                   PASS      27.49 seconds
CheckAllWarning               PASS      30.20 seconds
CheckSparse                   PASS      28.75 seconds
BuildKernel32                 PASS      26.44 seconds
CheckKernelLLVM               SKIP      0.00 seconds
TestRunnerSetup               PASS      505.24 seconds
TestRunner_l2cap-tester       PASS      66.39 seconds
IncrementalBuild              PASS      26.24 seconds

Details
##############################
Test: CheckKernelLLVM - SKIP
Desc: Build kernel with LLVM + context analysis
Output:
Clang not found


https://github.com/bluez/bluetooth-next/pull/665

---
Regards,
Linux Bluetooth

Re: [PATCH] Bluetooth: L2CAP: fix wrong identifier in __set_ack_timer()

[Paul Menzel]

Dear Pauli,


Thank you for your patch.

Am 29.08.26 um 17:13 schrieb Pauli Virtanen:
> __set_ack_timer(c) has chan->ack_timer instead of c->ack_timer like the
> other macros.
> 
> Fix it to use the timer corresponding to the macro argument.  In current
> code this is only called as __set_ack_timer(chan) so this has no runtime
> impact.
> 
> Signed-off-by: Pauli Virtanen <pav@iki.fi>
> ---
> 
> Notes:
>      Saw this one in Sashiko trace.
> 
>   include/net/bluetooth/l2cap.h | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
> index 69d193fee351..99c07f1278a0 100644
> --- a/include/net/bluetooth/l2cap.h
> +++ b/include/net/bluetooth/l2cap.h
> @@ -873,8 +873,8 @@ static inline bool l2cap_clear_timer(struct l2cap_chan *chan,
>   #define __clear_chan_timer(c) l2cap_clear_timer(c, &c->chan_timer)
>   #define __clear_retrans_timer(c) l2cap_clear_timer(c, &c->retrans_timer)
>   #define __clear_monitor_timer(c) l2cap_clear_timer(c, &c->monitor_timer)
> -#define __set_ack_timer(c) l2cap_set_timer(c, &chan->ack_timer, \
> -		msecs_to_jiffies(L2CAP_DEFAULT_ACK_TO));
> +#define __set_ack_timer(c) l2cap_set_timer(c, &c->ack_timer, \
> +		msecs_to_jiffies(L2CAP_DEFAULT_ACK_TO))
>   #define __clear_ack_timer(c) l2cap_clear_timer(c, &c->ack_timer)
>   
>   static inline int __seq_offset(struct l2cap_chan *chan, __u16 seq1, __u16 seq2)

Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de>


Kind regards,

Paul