diff --git a/[refs] b/[refs] index d5b045aeb69d..ef7f8c4ad863 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d2b88814c6a63e4018cd299826907a12068ffdb7 +refs/heads/master: 61c1d052a3c7d5acba3bd535aaffa5bb5d085181 diff --git a/trunk/net/dccp/output.c b/trunk/net/dccp/output.c index fea30cdc0bee..22a618af4893 100644 --- a/trunk/net/dccp/output.c +++ b/trunk/net/dccp/output.c @@ -175,7 +175,7 @@ unsigned int dccp_sync_mss(struct sock *sk, u32 pmtu) * make it a multiple of 4 */ - cur_mps -= ((5 + 6 + 10 + 6 + 6 + 6 + 3) / 4) * 4; + cur_mps -= roundup(5 + 6 + 10 + 6 + 6 + 6, 4); /* And store cached results */ icsk->icsk_pmtu_cookie = pmtu;