|
@@ -2561,7 +2561,6 @@ u32 __tcp_select_window(struct sock *sk)
|
|
|
/* Don't do rounding if we are using window scaling, since the
|
|
|
* scaled window will not line up with the MSS boundary anyway.
|
|
|
*/
|
|
|
- window = tp->rcv_wnd;
|
|
|
if (tp->rx_opt.rcv_wscale) {
|
|
|
window = free_space;
|
|
|
|
|
@@ -2569,10 +2568,9 @@ u32 __tcp_select_window(struct sock *sk)
|
|
|
* Import case: prevent zero window announcement if
|
|
|
* 1<<rcv_wscale > mss.
|
|
|
*/
|
|
|
- if (((window >> tp->rx_opt.rcv_wscale) << tp->rx_opt.rcv_wscale) != window)
|
|
|
- window = (((window >> tp->rx_opt.rcv_wscale) + 1)
|
|
|
- << tp->rx_opt.rcv_wscale);
|
|
|
+ window = ALIGN(window, (1 << tp->rx_opt.rcv_wscale));
|
|
|
} else {
|
|
|
+ window = tp->rcv_wnd;
|
|
|
/* Get the largest window that is a nice multiple of mss.
|
|
|
* Window clamp already applied above.
|
|
|
* If our current window offering is within 1 mss of the
|
|
@@ -2582,7 +2580,7 @@ u32 __tcp_select_window(struct sock *sk)
|
|
|
* is too small.
|
|
|
*/
|
|
|
if (window <= free_space - mss || window > free_space)
|
|
|
- window = (free_space / mss) * mss;
|
|
|
+ window = rounddown(free_space, mss);
|
|
|
else if (mss == full_space &&
|
|
|
free_space > window + (full_space >> 1))
|
|
|
window = free_space;
|