Bluetooth: Improve ERTM sequence number offset calculation
Instead of using modular division, the offset can be calculated using only addition and subtraction. The previous calculation did not work as intended and was more difficult to understand, involving unsigned integer underflow and a check for a negative value where one was not possible. Signed-off-by: Mat Martineau <mathewm@codeaurora.org> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Gustavo Padovan <gustavo@padovan.org>
This commit is contained in:
parent
2a8ff6112d
commit
5a364bd399
|
@ -724,13 +724,10 @@ static inline bool l2cap_clear_timer(struct l2cap_chan *chan,
|
||||||
|
|
||||||
static inline int __seq_offset(struct l2cap_chan *chan, __u16 seq1, __u16 seq2)
|
static inline int __seq_offset(struct l2cap_chan *chan, __u16 seq1, __u16 seq2)
|
||||||
{
|
{
|
||||||
int offset;
|
if (seq1 >= seq2)
|
||||||
|
return seq1 - seq2;
|
||||||
offset = (seq1 - seq2) % (chan->tx_win_max + 1);
|
else
|
||||||
if (offset < 0)
|
return chan->tx_win_max + 1 - seq2 + seq1;
|
||||||
offset += (chan->tx_win_max + 1);
|
|
||||||
|
|
||||||
return offset;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline __u16 __next_seq(struct l2cap_chan *chan, __u16 seq)
|
static inline __u16 __next_seq(struct l2cap_chan *chan, __u16 seq)
|
||||||
|
|
Loading…
Reference in a new issue