{"id":722,"url":"http://patchwork.ozlabs.org/api/1.0/patches/722/?format=json","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.0/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<1221933153-11874-2-git-send-email-ilpo.jarvinen@helsinki.fi>","date":"2008-09-20T17:52:19","name":"[net-next,01/15] tcp: Partial hint clearing has again become meaningless","commit_ref":null,"pull_url":null,"state":"rejected","archived":true,"hash":"5dfe77cde1988300d00f939ba81d0b26881c83b1","submitter":{"id":255,"url":"http://patchwork.ozlabs.org/api/1.0/people/255/?format=json","name":"Ilpo Järvinen","email":"ilpo.jarvinen@helsinki.fi"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/1221933153-11874-2-git-send-email-ilpo.jarvinen@helsinki.fi/mbox/","series":[],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/722/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Received":["from vger.kernel.org (vger.kernel.org [209.132.176.167])\n\tby ozlabs.org (Postfix) with ESMTP id 3BEFCDDECF\n\tfor ;\n\tSun, 21 Sep 2008 03:52:43 +1000 (EST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751241AbYITRwi (ORCPT );\n\tSat, 20 Sep 2008 13:52:38 -0400","(majordomo@vger.kernel.org) by vger.kernel.org id S1751127AbYITRwh\n\t(ORCPT ); Sat, 20 Sep 2008 13:52:37 -0400","from courier.cs.helsinki.fi ([128.214.9.1]:37645 \"EHLO\n\tmail.cs.helsinki.fi\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1750786AbYITRwg (ORCPT\n\t); Sat, 20 Sep 2008 13:52:36 -0400","from wrl-59.cs.helsinki.fi (wrl-59.cs.helsinki.fi\n\t[128.214.166.179])\n\t(AUTH: PLAIN cs-relay, TLS: TLSv1/SSLv3,256bits,AES256-SHA)\n\tby mail.cs.helsinki.fi with esmtp; Sat, 20 Sep 2008 20:52:34 +0300\n\tid 0005BECB.48D53862.00002B75","by wrl-59.cs.helsinki.fi (Postfix, from userid 50795)\n\tid DACB2A006C; Sat, 20 Sep 2008 20:52:33 +0300 (EEST)"],"From":"\"=?ISO-8859-1?Q?Ilpo_J=E4rvinen?=\" ","To":"David Miller ","Cc":"netdev@vger.kernel.org,\n\t\"=?utf-8?q?Ilpo=20J=E4rvinen?=\" ","Subject":"[PATCH net-next 01/15] tcp: Partial hint clearing has again become\n\tmeaningless","Date":"Sat, 20 Sep 2008 20:52:19 +0300","Message-Id":"<1221933153-11874-2-git-send-email-ilpo.jarvinen@helsinki.fi>","X-Mailer":"git-send-email 1.5.4.2.156.ge3c5","In-Reply-To":"<1221933153-11874-1-git-send-email-ilpo.jarvinen@helsinki.fi>","References":"<1221933153-11874-1-git-send-email-ilpo.jarvinen@helsinki.fi>","MIME-Version":"1.0","Content-Type":"text/plain; charset=ISO-8859-1","Content-Transfer-Encoding":"8bit","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Ie., the difference between partial and all clearing doesn't\nexists anymore since the SACK optimizations got dropped by\nan sacktag rewrite.\n\nSigned-off-by: Ilpo Järvinen \n---\n include/net/tcp.h | 7 +------\n net/ipv4/tcp_input.c | 5 ++---\n net/ipv4/tcp_output.c | 4 ++--\n 3 files changed, 5 insertions(+), 11 deletions(-)","diff":"diff --git a/include/net/tcp.h b/include/net/tcp.h\nindex 8983386..b716763 100644\n--- a/include/net/tcp.h\n+++ b/include/net/tcp.h\n@@ -1035,7 +1035,7 @@ static inline void tcp_mib_init(struct net *net)\n }\n \n /* from STCP */\n-static inline void tcp_clear_retrans_hints_partial(struct tcp_sock *tp)\n+static inline void tcp_clear_all_retrans_hints(struct tcp_sock *tp)\n {\n \ttp->lost_skb_hint = NULL;\n \ttp->scoreboard_skb_hint = NULL;\n@@ -1043,11 +1043,6 @@ static inline void tcp_clear_retrans_hints_partial(struct tcp_sock *tp)\n \ttp->forward_skb_hint = NULL;\n }\n \n-static inline void tcp_clear_all_retrans_hints(struct tcp_sock *tp)\n-{\n-\ttcp_clear_retrans_hints_partial(tp);\n-}\n-\n /* MD5 Signature */\n struct crypto_hash;\n \ndiff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c\nindex f79a516..7306bfb 100644\n--- a/net/ipv4/tcp_input.c\n+++ b/net/ipv4/tcp_input.c\n@@ -1883,7 +1883,7 @@ static void tcp_enter_frto_loss(struct sock *sk, int allowed_segments, int flag)\n \ttp->high_seq = tp->snd_nxt;\n \tTCP_ECN_queue_cwr(tp);\n \n-\ttcp_clear_retrans_hints_partial(tp);\n+\ttcp_clear_all_retrans_hints(tp);\n }\n \n static void tcp_clear_retrans_partial(struct tcp_sock *tp)\n@@ -1934,12 +1934,11 @@ void tcp_enter_loss(struct sock *sk, int how)\n \t\t/* Push undo marker, if it was plain RTO and nothing\n \t\t * was retransmitted. */\n \t\ttp->undo_marker = tp->snd_una;\n-\t\ttcp_clear_retrans_hints_partial(tp);\n \t} else {\n \t\ttp->sacked_out = 0;\n \t\ttp->fackets_out = 0;\n-\t\ttcp_clear_all_retrans_hints(tp);\n \t}\n+\ttcp_clear_all_retrans_hints(tp);\n \n \ttcp_for_write_queue(skb, sk) {\n \t\tif (skb == tcp_send_head(sk))\ndiff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c\nindex a00532d..2242c2c 100644\n--- a/net/ipv4/tcp_output.c\n+++ b/net/ipv4/tcp_output.c\n@@ -748,7 +748,7 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len,\n \n \tBUG_ON(len > skb->len);\n \n-\ttcp_clear_retrans_hints_partial(tp);\n+\ttcp_clear_all_retrans_hints(tp);\n \tnsize = skb_headlen(skb) - len;\n \tif (nsize < 0)\n \t\tnsize = 0;\n@@ -1821,7 +1821,7 @@ static void tcp_retrans_try_collapse(struct sock *sk, struct sk_buff *skb,\n \ttp->packets_out -= tcp_skb_pcount(next_skb);\n \n \t/* changed transmit queue under us so clear hints */\n-\ttcp_clear_retrans_hints_partial(tp);\n+\ttcp_clear_all_retrans_hints(tp);\n \n \tsk_wmem_free_skb(sk, next_skb);\n }\n","prefixes":["net-next","01/15"]}