[PATCH] Fix compile error in latest git pull - post 2.6.16-rc1-git4

After doing a git pull from linux/kernel/git/torvalds/linux-2.6.git, I get the following compiler error:

  CC      net/ipv4/igmp.o
net/ipv4/igmp.c: In function ‘igmp_rcv’:
net/ipv4/igmp.c:973: error: label at end of compound statement

Using git bisect, the patch that introduces this error is:

 c5d90e000437a463440c1fe039011a02583a9ee5 is first bad commit
diff-tree c5d90e000437a463440c1fe039011a02583a9ee5 (from e2c2fc2c8f3750e1f7ffbb3ac2b885a49416110c)
Author: Dave Jones <davej@xxxxxxxxxx>
Date:   Mon Jan 30 20:27:17 2006 -0800

    [IPV4] igmp: remove pointless printk

    This is easily triggerable by sending bogus packets,
    allowing a malicious user to flood remote logs.

    Signed-off-by: Dave Jones <davej@xxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>


I suspect this error arises due to differences between gcc 4.0.2 and earlier releases. The patch is as follows:

diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index f70ba62..0b4e95f 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -970,6 +970,7 @@ int igmp_rcv(struct sk_buff *skb)
        case IGMP_MTRACE_RESP:
                break;
        default:
+               break;
        }

 drop:


Larry Finger
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Relevant Pages