From 21a6a505bd3cd8eb3a0cac0b3ae77f0992338952 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <dada1@cosmosbay.com>
Date: Fri, 21 Dec 2007 05:58:29 -0800
Subject: [PATCH] --- yaml --- r: 78623 b: refs/heads/master c:
 8beb5c5f12c8484c59edf9b691f2c4bb4d31f3a0 h: refs/heads/master i:   78621:
 67a43987788026b33ee838e65d5889a70561d746   78619:
 7877eaa2f3e9aba1db82362397da5fcb3127ebb0   78615:
 a0013e9d3aa6027e1ff7700c723d9ca6770a64a0   78607:
 5e7c95475fb73a16141adb56fb20896b18046d24   78591:
 af2227ebe9b75f82b65772b8488830a3fa2c2524 v: v3

---
 [refs]                     | 2 +-
 trunk/net/ipv4/tcp_timer.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 177ad9cc7431..9cf372c4745f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 829942c18704250fce4d5eca787065a3ee7c685d
+refs/heads/master: 8beb5c5f12c8484c59edf9b691f2c4bb4d31f3a0
diff --git a/trunk/net/ipv4/tcp_timer.c b/trunk/net/ipv4/tcp_timer.c
index ea111e91f0e5..ea85bc00c61f 100644
--- a/trunk/net/ipv4/tcp_timer.c
+++ b/trunk/net/ipv4/tcp_timer.c
@@ -125,7 +125,7 @@ static void tcp_mtu_probing(struct inet_connection_sock *icsk, struct sock *sk)
 			struct tcp_sock *tp = tcp_sk(sk);
 			int mss;
 
-			mss = tcp_mtu_to_mss(sk, icsk->icsk_mtup.search_low)/2;
+			mss = tcp_mtu_to_mss(sk, icsk->icsk_mtup.search_low) >> 1;
 			mss = min(sysctl_tcp_base_mss, mss);
 			mss = max(mss, 68 - tp->tcp_header_len);
 			icsk->icsk_mtup.search_low = tcp_mss_to_mtu(sk, mss);