{"id":725,"url":"http://patchwork.ozlabs.org/api/1.0/patches/725/?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-10-git-send-email-ilpo.jarvinen@helsinki.fi>","date":"2008-09-20T17:52:27","name":"[net-next,09/15] tcp: Reorganize skb tagbit checks","commit_ref":null,"pull_url":null,"state":"rejected","archived":true,"hash":"55cf932bc5119276652b06d90e0fd33f813249c6","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-10-git-send-email-ilpo.jarvinen@helsinki.fi/mbox/","series":[],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/725/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 D692FDDED8\n\tfor ;\n\tSun, 21 Sep 2008 03:52:54 +1000 (EST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751141AbYITRwr (ORCPT );\n\tSat, 20 Sep 2008 13:52:47 -0400","(majordomo@vger.kernel.org) by vger.kernel.org id S1750884AbYITRwo\n\t(ORCPT ); Sat, 20 Sep 2008 13:52:44 -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 S1751127AbYITRwj (ORCPT\n\t); Sat, 20 Sep 2008 13:52:39 -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 0005BED9.48D53862.00002CBA","by wrl-59.cs.helsinki.fi (Postfix, from userid 50795)\n\tid 7E666A00A9; Sat, 20 Sep 2008 20:52:34 +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 09/15] tcp: Reorganize skb tagbit checks","Date":"Sat, 20 Sep 2008 20:52:27 +0300","Message-Id":"<1221933153-11874-10-git-send-email-ilpo.jarvinen@helsinki.fi>","X-Mailer":"git-send-email 1.5.4.2.156.ge3c5","In-Reply-To":"<1221933153-11874-9-git-send-email-ilpo.jarvinen@helsinki.fi>","References":"<1221933153-11874-1-git-send-email-ilpo.jarvinen@helsinki.fi>\n\t<1221933153-11874-2-git-send-email-ilpo.jarvinen@helsinki.fi>\n\t<1221933153-11874-3-git-send-email-ilpo.jarvinen@helsinki.fi>\n\t<1221933153-11874-4-git-send-email-ilpo.jarvinen@helsinki.fi>\n\t<1221933153-11874-5-git-send-email-ilpo.jarvinen@helsinki.fi>\n\t<1221933153-11874-6-git-send-email-ilpo.jarvinen@helsinki.fi>\n\t<1221933153-11874-7-git-send-email-ilpo.jarvinen@helsinki.fi>\n\t<1221933153-11874-8-git-send-email-ilpo.jarvinen@helsinki.fi>\n\t<1221933153-11874-9-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":"Signed-off-by: Ilpo Järvinen \n---\n net/ipv4/tcp_output.c | 38 +++++++++++++++++++-------------------\n 1 files changed, 19 insertions(+), 19 deletions(-)","diff":"diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c\nindex 8d4859a..d5f53f8 100644\n--- a/net/ipv4/tcp_output.c\n+++ b/net/ipv4/tcp_output.c\n@@ -2034,6 +2034,7 @@ void tcp_xmit_retransmit_queue(struct sock *sk)\n \tconst struct inet_connection_sock *icsk = inet_csk(sk);\n \tstruct tcp_sock *tp = tcp_sk(sk);\n \tstruct sk_buff *skb;\n+\tint mib_idx;\n \n \tif (tp->retransmit_skb_hint)\n \t\tskb = tp->retransmit_skb_hint;\n@@ -2061,27 +2062,26 @@ void tcp_xmit_retransmit_queue(struct sock *sk)\n \t\t\t\treturn;\n \t\t\tif (!before(TCP_SKB_CB(skb)->seq, tp->retransmit_high))\n \t\t\t\tbreak;\n+\t\t\tif (sacked & (TCPCB_SACKED_ACKED|TCPCB_SACKED_RETRANS))\n+\t\t\t\tcontinue;\n \n-\t\t\tif (sacked & TCPCB_LOST) {\n-\t\t\t\tif (!(sacked & (TCPCB_SACKED_ACKED|TCPCB_SACKED_RETRANS))) {\n-\t\t\t\t\tint mib_idx;\n-\n-\t\t\t\t\tif (tcp_retransmit_skb(sk, skb)) {\n-\t\t\t\t\t\ttp->retransmit_skb_hint = NULL;\n-\t\t\t\t\t\treturn;\n-\t\t\t\t\t}\n-\t\t\t\t\tif (icsk->icsk_ca_state != TCP_CA_Loss)\n-\t\t\t\t\t\tmib_idx = LINUX_MIB_TCPFASTRETRANS;\n-\t\t\t\t\telse\n-\t\t\t\t\t\tmib_idx = LINUX_MIB_TCPSLOWSTARTRETRANS;\n-\t\t\t\t\tNET_INC_STATS_BH(sock_net(sk), mib_idx);\n-\n-\t\t\t\t\tif (skb == tcp_write_queue_head(sk))\n-\t\t\t\t\t\tinet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,\n-\t\t\t\t\t\t\t\t\t inet_csk(sk)->icsk_rto,\n-\t\t\t\t\t\t\t\t\t TCP_RTO_MAX);\n-\t\t\t\t}\n+\t\t\tif (!(sacked & TCPCB_LOST))\n+\t\t\t\tcontinue;\n+\n+\t\t\tif (tcp_retransmit_skb(sk, skb)) {\n+\t\t\t\ttp->retransmit_skb_hint = NULL;\n+\t\t\t\treturn;\n \t\t\t}\n+\t\t\tif (icsk->icsk_ca_state != TCP_CA_Loss)\n+\t\t\t\tmib_idx = LINUX_MIB_TCPFASTRETRANS;\n+\t\t\telse\n+\t\t\t\tmib_idx = LINUX_MIB_TCPSLOWSTARTRETRANS;\n+\t\t\tNET_INC_STATS_BH(sock_net(sk), mib_idx);\n+\n+\t\t\tif (skb == tcp_write_queue_head(sk))\n+\t\t\t\tinet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,\n+\t\t\t\t\t\t\t inet_csk(sk)->icsk_rto,\n+\t\t\t\t\t\t\t TCP_RTO_MAX);\n \t\t}\n \t}\n \n","prefixes":["net-next","09/15"]}