From: Wolfgang Denk <wd@denx.de>
Date: Fri, 4 Nov 2011 15:55:42 +0000 (+0000)
Subject: net/net.c: Fix GCC 4.6 build warning
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=5c10419cead8f900e106046f6574cfeab7887e44;p=u-boot.git

net/net.c: Fix GCC 4.6 build warning

Fix:
net.c: In function 'CDPHandler':
net.c:1083:8: warning: variable 'applid' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
---

diff --git a/net/net.c b/net/net.c
index 8f55281f40..d0fe1c4960 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1080,7 +1080,6 @@ CDPHandler(const uchar *pkt, unsigned len)
 	const uchar *t;
 	const ushort *ss;
 	ushort type, tlen;
-	uchar applid;
 	ushort vlan, nvlan;
 
 	/* minimum size? */
@@ -1152,11 +1151,10 @@ CDPHandler(const uchar *pkt, unsigned len)
 				if (tlen < 3)
 					goto pkt_short;
 
-				applid = t[0];
 				ss = (const ushort *)(t + 1);
 
 #ifdef CONFIG_CDP_APPLIANCE_VLAN_TYPE
-				if (applid == CONFIG_CDP_APPLIANCE_VLAN_TYPE)
+				if (t[0] == CONFIG_CDP_APPLIANCE_VLAN_TYPE)
 					vlan = *ss;
 #else
 				/* XXX will this work; dunno */