Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=af610b4ca19f513a50d47ea93ed57241383c8081
Commit: af610b4ca19f513a50d47ea93ed57241383c8081
Parent: bdf1ee5d3bd38d0c44bd7baa74e07adcbe4ceab1
Author: Ilpo Järvinen <[EMAIL PROTECTED]>
AuthorDate: Fri Jun 15 12:58:38 2007 +0300
Committer: David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Oct 10 16:47:54 2007 -0700
[TCP]: Add tcp_dec_pcount_approx int variant
Signed-off-by: Ilpo Järvinen <[EMAIL PROTECTED]>
Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
include/net/tcp.h | 11 ++++++++---
net/ipv4/tcp_output.c | 12 +++---------
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/include/net/tcp.h b/include/net/tcp.h
index dde04af..9d3438f 100644
--- a/include/net/tcp.h
+++ b/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/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 3abe22e..3c8c8e7 100644
--- a/net/ipv4/tcp_output.c
+++ b/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);
}
}
}
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
