summaryrefslogtreecommitdiffstats
path: root/common/cmd_net.c
diff options
context:
space:
mode:
authorJoe Hershberger <joe.hershberger@ni.com>2015-04-08 01:41:14 -0500
committerSimon Glass <sjg@chromium.org>2015-04-18 11:11:34 -0600
commit6aede5b750e342c3293ec1d87c4dbb9376280bbe (patch)
tree8047c5b255d7a28924301394700976efc37c3641 /common/cmd_net.c
parent331db5a90f0431465c36189672b2096b9b1e37d0 (diff)
downloadtalos-obmc-uboot-6aede5b750e342c3293ec1d87c4dbb9376280bbe.tar.gz
talos-obmc-uboot-6aede5b750e342c3293ec1d87c4dbb9376280bbe.zip
net: cosmetic: Clean up CDP variables and functions
Make a thorough pass through all variables and function names contained within cdp.c and remove CamelCase and improve naming. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common/cmd_net.c')
-rw-r--r--common/cmd_net.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/common/cmd_net.c b/common/cmd_net.c
index 87c4ed112b..1deebf2b87 100644
--- a/common/cmd_net.c
+++ b/common/cmd_net.c
@@ -290,18 +290,19 @@ static void cdp_update_env(void)
{
char tmp[16];
- if (CDPApplianceVLAN != htons(-1)) {
- printf("CDP offered appliance VLAN %d\n", ntohs(CDPApplianceVLAN));
- VLAN_to_string(CDPApplianceVLAN, tmp);
+ if (cdp_appliance_vlan != htons(-1)) {
+ printf("CDP offered appliance VLAN %d\n",
+ ntohs(cdp_appliance_vlan));
+ VLAN_to_string(cdp_appliance_vlan, tmp);
setenv("vlan", tmp);
- NetOurVLAN = CDPApplianceVLAN;
+ NetOurVLAN = cdp_appliance_vlan;
}
- if (CDPNativeVLAN != htons(-1)) {
- printf("CDP offered native VLAN %d\n", ntohs(CDPNativeVLAN));
- VLAN_to_string(CDPNativeVLAN, tmp);
+ if (cdp_native_vlan != htons(-1)) {
+ printf("CDP offered native VLAN %d\n", ntohs(cdp_native_vlan));
+ VLAN_to_string(cdp_native_vlan, tmp);
setenv("nvlan", tmp);
- NetOurNativeVLAN = CDPNativeVLAN;
+ NetOurNativeVLAN = cdp_native_vlan;
}
}
OpenPOWER on IntegriCloud