aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlpo Järvinen <ilpo.jarvinen@helsinki.fi>2009-02-27 23:44:41 -0500
committerDavid S. Miller <davem@davemloft.net>2009-03-02 06:00:16 -0500
commit0d6a775e27d975e5f9ea8e2911216d84face50ca (patch)
treea19fc1938325c517cab08ef7706115e784c72bb5
parentcabeccbd172cc305f4383f5a4808ae254745275f (diff)
tcp: in sendmsg/pages open code the real goto target
copied was assigned zero right before the goto, so if (copied) cannot ever be true. Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv4/tcp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 90b2f3c192ff..d3f9beee74c0 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -683,7 +683,7 @@ static ssize_t do_tcp_sendpages(struct sock *sk, struct page **pages, int poffse
683 683
684 err = -EPIPE; 684 err = -EPIPE;
685 if (sk->sk_err || (sk->sk_shutdown & SEND_SHUTDOWN)) 685 if (sk->sk_err || (sk->sk_shutdown & SEND_SHUTDOWN))
686 goto do_error; 686 goto out_err;
687 687
688 while (psize > 0) { 688 while (psize > 0) {
689 struct sk_buff *skb = tcp_write_queue_tail(sk); 689 struct sk_buff *skb = tcp_write_queue_tail(sk);
@@ -854,7 +854,7 @@ int tcp_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
854 854
855 err = -EPIPE; 855 err = -EPIPE;
856 if (sk->sk_err || (sk->sk_shutdown & SEND_SHUTDOWN)) 856 if (sk->sk_err || (sk->sk_shutdown & SEND_SHUTDOWN))
857 goto do_error; 857 goto out_err;
858 858
859 while (--iovlen >= 0) { 859 while (--iovlen >= 0) {
860 int seglen = iov->iov_len; 860 int seglen = iov->iov_len;