From: sebastian@breakpoint.cc <sebastian@breakpoint.cc>
Date: Thu, 26 Jul 2007 21:21:33 +0000 (+0200)
Subject: sctp: remove shadowed symbols
X-Git-Tag: v2.6.23-rc2~9^2~2^2~6
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c86dabcf00f3ca167df59f3526a53b3da3ede2c8;p=~shefty%2Frdma-dev.git

sctp: remove shadowed symbols

Fixes the following sparse warnings:
net/sctp/sm_make_chunk.c:1457:9: warning: symbol 'len' shadows an earlier one
net/sctp/sm_make_chunk.c:1356:23: originally declared here
net/sctp/socket.c:1534:22: warning: symbol 'chunk' shadows an earlier one
net/sctp/socket.c:1387:20: originally declared here

Signed-off-by: Sebastian Siewior <sebastian@breakpoint.cc>
Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
---

diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index ad02311dcd8..ba76ceca2a4 100644
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -1452,7 +1452,6 @@ no_hmac:
 		do_gettimeofday(&tv);
 
 	if (!asoc && tv_lt(bear_cookie->expiration, tv)) {
-		__u16 len;
 		/*
 		 * Section 3.3.10.3 Stale Cookie Error (3)
 		 *
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index f8de0eb235d..b31be099457 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -1529,7 +1529,6 @@ SCTP_STATIC int sctp_sendmsg(struct kiocb *iocb, struct sock *sk,
 			goto out_unlock;
 		}
 		if (sinfo_flags & SCTP_ABORT) {
-			struct sctp_chunk *chunk;
 
 			chunk = sctp_make_abort_user(asoc, msg, msg_len);
 			if (!chunk) {