From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 26 Nov 2008 00:47:35 +0000 (-0800)
Subject: s2io: fix warning in drivers/net/s2io.c
X-Git-Tag: v2.6.29-rc1~581^2~480
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2e6a684b8489b21324f314be2bd8d3788a9f6445;p=linux-2.6-omap-h63xx.git

s2io: fix warning in drivers/net/s2io.c

this warning:

  drivers/net/s2io.c: In function ‘rx_intr_handler’:
  drivers/net/s2io.c:7369: warning: ‘lro’ may be used uninitialized in this function

triggers because GCC does not recognize the (correct) error flow
between:

 - s2io_club_tcp_session()and 'lro'

Annotate it.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index a4642054a0d..1b489df80fa 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -7367,7 +7367,7 @@ static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp)
 	int ring_no = ring_data->ring_no;
 	u16 l3_csum, l4_csum;
 	unsigned long long err = rxdp->Control_1 & RXD_T_CODE;
-	struct lro *lro;
+	struct lro *uninitialized_var(lro);
 	u8 err_mask;
 
 	skb->dev = dev;