From 61edd0f4ce9c7f2134768a1589aa3e1c53cfdf54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= <ilpo.jarvinen@helsinki.fi>
Date: Fri, 15 Jun 2007 12:58:38 +0300
Subject: [PATCH] --- yaml --- r: 66258 b: refs/heads/master c:
 af610b4ca19f513a50d47ea93ed57241383c8081 h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/include/net/tcp.h     | 11 ++++++++---
 trunk/net/ipv4/tcp_output.c | 12 +++---------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 0e048224a636..d43e7ffb651e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bdf1ee5d3bd38d0c44bd7baa74e07adcbe4ceab1
+refs/heads/master: af610b4ca19f513a50d47ea93ed57241383c8081
diff --git a/trunk/include/net/tcp.h b/trunk/include/net/tcp.h
index dde04afbe0a4..9d3438f6b52f 100644
--- a/trunk/include/net/tcp.h
+++ b/trunk/include/net/tcp.h
@@ -599,16 +599,21 @@ static inline int tcp_skb_mss(const struct sk_buff *skb)
 	return skb_shinfo(skb)->gso_size;
 }
 
-static inline void tcp_dec_pcount_approx(__u32 *count,
-					 const struct sk_buff *skb)
+static inline void tcp_dec_pcount_approx_int(__u32 *count, const int decr)
 {
 	if (*count) {
-		*count -= tcp_skb_pcount(skb);
+		*count -= decr;
 		if ((int)*count < 0)
 			*count = 0;
 	}
 }
 
+static inline void tcp_dec_pcount_approx(__u32 *count,
+					 const struct sk_buff *skb)
+{
+	tcp_dec_pcount_approx_int(count, tcp_skb_pcount(skb));
+}
+
 static inline void tcp_packets_out_inc(struct sock *sk,
 				       const struct sk_buff *skb)
 {
diff --git a/trunk/net/ipv4/tcp_output.c b/trunk/net/ipv4/tcp_output.c
index 3abe22e4b576..3c8c8e7f6f6d 100644
--- a/trunk/net/ipv4/tcp_output.c
+++ b/trunk/net/ipv4/tcp_output.c
@@ -740,22 +740,16 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, unsigned int mss
 		if (diff > 0) {
 			/* Adjust Reno SACK estimate. */
 			if (!tp->rx_opt.sack_ok) {
-				tp->sacked_out -= diff;
-				if ((int)tp->sacked_out < 0)
-					tp->sacked_out = 0;
+				tcp_dec_pcount_approx_int(&tp->sacked_out, diff);
 				tcp_sync_left_out(tp);
 			}
 
-			tp->fackets_out -= diff;
-			if ((int)tp->fackets_out < 0)
-				tp->fackets_out = 0;
+			tcp_dec_pcount_approx_int(&tp->fackets_out, diff);
 			/* SACK fastpath might overwrite it unless dealt with */
 			if (tp->fastpath_skb_hint != NULL &&
 			    after(TCP_SKB_CB(tp->fastpath_skb_hint)->seq,
 				  TCP_SKB_CB(skb)->seq)) {
-				tp->fastpath_cnt_hint -= diff;
-				if ((int)tp->fastpath_cnt_hint < 0)
-					tp->fastpath_cnt_hint = 0;
+				tcp_dec_pcount_approx_int(&tp->fastpath_cnt_hint, diff);
 			}
 		}
 	}