* [PATCH net-next-2.6] tcp: clean up twisted goto in tcp_rcv_synsent_state_process()
@ 2010-12-13 8:11 Yoichi Yuasa
2010-12-13 17:42 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Yoichi Yuasa @ 2010-12-13 8:11 UTC (permalink / raw)
To: David S. Miller; +Cc: yuasa, netdev
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next-2.6] tcp: clean up twisted goto in tcp_rcv_synsent_state_process()
2010-12-13 8:11 [PATCH net-next-2.6] tcp: clean up twisted goto in tcp_rcv_synsent_state_process() Yoichi Yuasa
@ 2010-12-13 17:42 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-12-13 17:42 UTC (permalink / raw)
To: yuasa; +Cc: netdev
From: Yoichi Yuasa <yuasa@linux-mips.org>
Date: Mon, 13 Dec 2010 17:11:49 +0900
> Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
I've been reading this stretch of code for 5+ years and it's
perfectly readable to me and your version is not any more
readable than what's there now.
I'm not applying this, sorry.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-12-13 17:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-13 8:11 [PATCH net-next-2.6] tcp: clean up twisted goto in tcp_rcv_synsent_state_process() Yoichi Yuasa
2010-12-13 17:42 ` David Miller
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).