summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-11-04 15:55:42 +0000
committerWolfgang Denk <wd@denx.de>2011-11-07 22:14:29 +0100
commit5c10419cead8f900e106046f6574cfeab7887e44 (patch)
tree9e8e6a01b7302f2282b7c311367fb680331b09b5
parent250b66e2cec11289c41f274082e73cb04706cd3c (diff)
downloadu-boot-imx-5c10419cead8f900e106046f6574cfeab7887e44.zip
u-boot-imx-5c10419cead8f900e106046f6574cfeab7887e44.tar.gz
u-boot-imx-5c10419cead8f900e106046f6574cfeab7887e44.tar.bz2
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>
-rw-r--r--net/net.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/net.c b/net/net.c
index 8f55281..d0fe1c4 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 */