[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: [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