Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79dc1901 authored by Andrew Morton's avatar Andrew Morton Committed by Jeff Garzik
Browse files

[PATCH] s2io c99 warning fix



drivers/net/s2io.c: In function `verify_l3_l4_lro_capable':
drivers/net/s2io.c:6638: warning: ISO C90 forbids mixed declarations and code

Cc: Ravinandan Arakali <Ravinandan.Arakali@neterion.com>
Cc: Ananda Raju <Ananda.Raju@neterion.com>
Cc: Adrian Bunk <bunk@stusta.de>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent fe931395
Loading
Loading
Loading
Loading
+2 −1
Original line number Original line Diff line number Diff line
@@ -6634,9 +6634,10 @@ static void aggregate_new_rx(lro_t *lro, struct iphdr *ip,
static int verify_l3_l4_lro_capable(lro_t *l_lro, struct iphdr *ip,
static int verify_l3_l4_lro_capable(lro_t *l_lro, struct iphdr *ip,
				    struct tcphdr *tcp, u32 tcp_pyld_len)
				    struct tcphdr *tcp, u32 tcp_pyld_len)
{
{
	DBG_PRINT(INFO_DBG,"%s: Been here...\n", __FUNCTION__);
	u8 *ptr;
	u8 *ptr;


	DBG_PRINT(INFO_DBG,"%s: Been here...\n", __FUNCTION__);

	if (!tcp_pyld_len) {
	if (!tcp_pyld_len) {
		/* Runt frame or a pure ack */
		/* Runt frame or a pure ack */
		return -1;
		return -1;