netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andre Tomt <andre@tomt.net>
To: Netdev <netdev@oss.sgi.com>, davem@davemloft.net
Subject: [PATCH] Fix a gcc-3.4 build failure and gcc-3.3 build warnings with TCP_DEBUG disabled in tcp.h
Date: Sat, 12 Mar 2005 07:10:12 +0100	[thread overview]
Message-ID: <423287C4.60701@tomt.net> (raw)

[-- Attachment #1: Type: text/plain, Size: 167 bytes --]

Fix a gcc-3.4 build failure and gcc-3.3 build warnings with TCP_DEBUG 
disabled in tcp.h

Patch (with description and signed-off-by) attached due to braindamaged MUA.

[-- Attachment #2: fix-tcp-non-debug-build.patch --]
[-- Type: text/x-patch, Size: 1149 bytes --]

Fix a gcc-3.4 build failure and gcc-3.3 build warnings with TCP_DEBUG
disabled in tcp.h

TCP_DEBUG is default on, but it should work with it off anyway.

With gcc-3.4:
  CC      net/core/sock.o
In file included from net/core/sock.c:127:
include/net/tcp.h: In function `tcp_reset_xmit_timer':
include/net/tcp.h:1042: error: label at end of compound statement
make[3]: *** [net/core/sock.o] Error 1
make[2]: *** [net/core] Error 2
make[1]: *** [net] Error 2
make[1]: Leaving directory `/build/kernel/linux-2.6.11-s3'
make: *** [stamp-build] Error 2

With gcc-3.3:
In file included from net/ipv4/icmp.c:84:
include/net/tcp.h: In function `tcp_reset_xmit_timer':
include/net/tcp.h:1042: warning: deprecated use of label at end of compound statement
(times everywhere tcp.h is included)

Signed-off-by: Andre Tomt <andre@tomt.net>

diff -Naur linux-2.6.11/include/net/tcp.h linux-2.6.11-1.1/include/net/tcp.h
--- linux-2.6.11/include/net/tcp.h	2005-03-02 08:37:48.000000000 +0100
+++ linux-2.6.11-1.1/include/net/tcp.h	2005-03-12 07:00:52.000000000 +0100
@@ -1039,6 +1039,7 @@
 #ifdef TCP_DEBUG
 		printk(tcp_timer_bug_msg);
 #endif
+		return;
 	};
 }
 

             reply	other threads:[~2005-03-12  6:10 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-03-12  6:10 Andre Tomt [this message]
2005-03-15  5:37 ` [PATCH] Fix a gcc-3.4 build failure and gcc-3.3 build warnings with TCP_DEBUG disabled in tcp.h David S. 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=423287C4.60701@tomt.net \
    --to=andre@tomt.net \
    --cc=davem@davemloft.net \
    --cc=netdev@oss.sgi.com \
    /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).