Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into merge

1 files changed, 0 insertions, 15 deletions

diff --git a/include/net/tcp.h b/include/net/tcp.h
index e54c76d7549..1b94b9bfe2d 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -616,21 +616,6 @@ static inline int tcp_skb_mss(const struct sk_buff *skb)
         return skb_shinfo(skb)->gso_size;
 }
 
-static inline void tcp_dec_pcount_approx_int(__u32 *count, const int decr)
-{
-        if (*count) {
-                *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));
-}
-
 /* Events passed to congestion control interface */
 enum tcp_ca_event {
         CA_EVENT_TX_START,      /* first transmit when no packets in flight */