]> git.karo-electronics.de Git - karo-tx-linux.git/commit
tcp: fix range tcp_shifted_skb() passes to tcp_sacktag_one()
authorNeal Cardwell <ncardwell@google.com>
Sun, 12 Feb 2012 18:37:10 +0000 (18:37 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 1 Mar 2012 00:34:16 +0000 (16:34 -0800)
commitdd31c1ce7ef7b363215081fde02f13bf3e50b5a1
tree8080df1b00e528814195a69f24fd6508d0554623
parent382e8f84cb3db5295aa2f142a11e42eac6544ab4
tcp: fix range tcp_shifted_skb() passes to tcp_sacktag_one()

[ Upstream commit daef52bab1fd26e24e8e9578f8fb33ba1d0cb412 ]

Fix the newly-SACKed range to be the range of newly-shifted bytes.

Previously - since 832d11c5cd076abc0aa1eaf7be96c81d1a59ce41 -
tcp_shifted_skb() incorrectly called tcp_sacktag_one() with the start
and end sequence numbers of the skb it passes in set to the range just
beyond the range that is newly-SACKed.

This commit also removes a special-case adjustment to lost_cnt_hint in
tcp_shifted_skb() since the pre-existing adjustment of lost_cnt_hint
in tcp_sacktag_one() now properly handles this things now that the
correct start sequence number is passed in.

Signed-off-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/ipv4/tcp_input.c