V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

net/net.c: cosmetic: fix indentation 

This removes the following checkpatch issues:
 - ERROR: switch and case should be at the same indent
 - WARNING: suspect code indent for conditional statements
 - WARNING: labels should not be indented

Signed-off-by: Luca Ceresoli <luca.ceresoli@comelit.it>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Ben Warren <biggerbadderben@gmail.com>
This commit is contained in:
Luca Ceresoli 2011-05-04 02:40:46 +00:00 committed by Wolfgang Denk
parent 92895de978
commit c819abeef7
1 changed files with 41 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
net/net.c
View File

@ -1103,51 +1103,50 @@ CDPHandler(const uchar *pkt, unsigned len)
tlen -= 4; tlen -= 4;
switch (type) { switch (type) {
case CDP_DEVICE_ID_TLV: case CDP_DEVICE_ID_TLV:
break; break;
case CDP_ADDRESS_TLV: case CDP_ADDRESS_TLV:
break; break;
case CDP_PORT_ID_TLV: case CDP_PORT_ID_TLV:
break; break;
case CDP_CAPABILITIES_TLV: case CDP_CAPABILITIES_TLV:
break; break;
case CDP_VERSION_TLV: case CDP_VERSION_TLV:
break; break;
case CDP_PLATFORM_TLV: case CDP_PLATFORM_TLV:
break; break;
case CDP_NATIVE_VLAN_TLV: case CDP_NATIVE_VLAN_TLV:
nvlan = *ss; nvlan = *ss;
break; break;
case CDP_APPLIANCE_VLAN_TLV: case CDP_APPLIANCE_VLAN_TLV:
t = (const uchar *)ss; t = (const uchar *)ss;
while (tlen > 0) { while (tlen > 0) {
if (tlen < 3) if (tlen < 3)
goto pkt_short; goto pkt_short;
applid = t[0]; applid = t[0];
ss = (const ushort *)(t + 1); ss = (const ushort *)(t + 1);
#ifdef CONFIG_CDP_APPLIANCE_VLAN_TYPE #ifdef CONFIG_CDP_APPLIANCE_VLAN_TYPE
if (applid == if (applid == CONFIG_CDP_APPLIANCE_VLAN_TYPE)
CONFIG_CDP_APPLIANCE_VLAN_TYPE) vlan = *ss;
vlan = *ss;
#else #else
/* XXX will this work; dunno */ /* XXX will this work; dunno */
vlan = ntohs(*ss); vlan = ntohs(*ss);
#endif #endif
t += 3; tlen -= 3; t += 3; tlen -= 3;
} }
break; break;
case CDP_TRIGGER_TLV: case CDP_TRIGGER_TLV:
break; break;
case CDP_POWER_CONSUMPTION_TLV: case CDP_POWER_CONSUMPTION_TLV:
break; break;
case CDP_SYSNAME_TLV: case CDP_SYSNAME_TLV:
break; break;
case CDP_SYSOBJECT_TLV: case CDP_SYSOBJECT_TLV:
break; break;
case CDP_MANAGEMENT_ADDRESS_TLV: case CDP_MANAGEMENT_ADDRESS_TLV:
break; break;
} }
} }
@ -1608,7 +1607,7 @@ NetReceive(volatile uchar *inpkt, int len)
#ifdef CONFIG_MCAST_TFTP #ifdef CONFIG_MCAST_TFTP
if (Mcast_addr != tmp) if (Mcast_addr != tmp)
#endif #endif
return; return;
} }
/* Read source IP address for later use */ /* Read source IP address for later use */
src_ip = NetReadIP(&ip->ip_src); src_ip = NetReadIP(&ip->ip_src);
@ -1883,7 +1882,7 @@ NetSetEther(volatile uchar *xet, uchar * addr, uint prot)
memcpy(et->et_dest, addr, 6); memcpy(et->et_dest, addr, 6);
memcpy(et->et_src, NetOurEther, 6); memcpy(et->et_src, NetOurEther, 6);
if ((myvlanid & VLAN_IDMASK) == VLAN_NONE) { if ((myvlanid & VLAN_IDMASK) == VLAN_NONE) {
et->et_protlen = htons(prot); et->et_protlen = htons(prot);
return ETHER_HDR_SIZE; return ETHER_HDR_SIZE;
} else { } else {
VLAN_Ethernet_t *vet = (VLAN_Ethernet_t *)xet; VLAN_Ethernet_t *vet = (VLAN_Ethernet_t *)xet;