From: Yoichi Yuasa <yuasa@linux-mips.org>
To: "David S. Miller" <davem@davemloft.net>
Cc: yuasa@linux-mips.org, netdev <netdev@vger.kernel.org>
Subject: [PATCH net-next-2.6] tcp: clean up twisted goto in tcp_rcv_synsent_state_process()
Date: Mon, 13 Dec 2010 17:11:49 +0900 [thread overview]
Message-ID: <20101213171149.16f178ef.yuasa@linux-mips.org> (raw)
Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
---
net/ipv4/tcp_input.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 824e8c8..ae4200c 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -5623,9 +5623,7 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb,
inet_csk_reset_xmit_timer(sk, ICSK_TIME_DACK,
TCP_DELACK_MAX, TCP_RTO_MAX);
-discard:
- __kfree_skb(skb);
- return 0;
+ goto discard;
} else {
tcp_send_ack(sk);
}
@@ -5704,7 +5702,9 @@ discard:
discard_and_undo:
tcp_clear_options(&tp->rx_opt);
tp->rx_opt.mss_clamp = saved_clamp;
- goto discard;
+discard:
+ __kfree_skb(skb);
+ return 0;
reset_and_undo:
tcp_clear_options(&tp->rx_opt);
--
1.7.3.3
next reply other threads:[~2010-12-13 8:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-13 8:11 Yoichi Yuasa [this message]
2010-12-13 17:42 ` [PATCH net-next-2.6] tcp: clean up twisted goto in tcp_rcv_synsent_state_process() David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101213171149.16f178ef.yuasa@linux-mips.org \
--to=yuasa@linux-mips.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).