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>

diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 86bb83bc6a4f5b4f8da5656251e17dba6b98c177..084dec001bf284a924f26d4e822afc2c04c6e1e8 100644 (file)
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -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)
 {
-       int offset;
-
-       offset = (seq1 - seq2) % (chan->tx_win_max + 1);
-       if (offset < 0)
-               offset += (chan->tx_win_max + 1);
-
-       return offset;
+       if (seq1 >= seq2)
+               return seq1 - seq2;
+       else
+               return chan->tx_win_max + 1 - seq2 + seq1;
 }
 
 static inline __u16 __next_seq(struct l2cap_chan *chan, __u16 seq)