From: David S. Miller <davem@davemloft.net>
Date: Sat, 12 Dec 2009 01:12:17 +0000 (-0800)
Subject: Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
X-Git-Tag: v2.6.33-rc1~59^2~26
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=501706565b2d4d2d40d0d301d5411ede099b8a6f;p=platform%2Fkernel%2Flinux-3.10.git

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	include/net/tcp.h
---

501706565b2d4d2d40d0d301d5411ede099b8a6f
diff --cc include/net/tcp.h
index 0248c18,5740b85..1b6f7d3
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@@ -1261,7 -1261,29 +1261,6 @@@ static inline struct sk_buff *tcp_write
  #define tcp_for_write_queue_from_safe(skb, tmp, sk)			\
  	skb_queue_walk_from_safe(&(sk)->sk_write_queue, skb, tmp)
  
 -/* This function calculates a "timeout" which is equivalent to the timeout of a
 - * TCP connection after "boundary" unsuccessful, exponentially backed-off
 - * retransmissions with an initial RTO of TCP_RTO_MIN.
 - */
 -static inline bool retransmits_timed_out(const struct sock *sk,
 -					 unsigned int boundary)
 -{
 -	unsigned int timeout, linear_backoff_thresh;
 -
 -	if (!inet_csk(sk)->icsk_retransmits)
 -		return false;
 -
 -	linear_backoff_thresh = ilog2(TCP_RTO_MAX/TCP_RTO_MIN);
 -
 -	if (boundary <= linear_backoff_thresh)
 -		timeout = ((2 << boundary) - 1) * TCP_RTO_MIN;
 -	else
 -		timeout = ((2 << linear_backoff_thresh) - 1) * TCP_RTO_MIN +
 -			  (boundary - linear_backoff_thresh) * TCP_RTO_MAX;
 -
 -	return (tcp_time_stamp - tcp_sk(sk)->retrans_stamp) >= timeout;
 -}
--
  static inline struct sk_buff *tcp_send_head(struct sock *sk)
  {
  	return sk->sk_send_head;