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

net: cosmetic: Rename "x" to "eth_proto" 

x is a poor variable name

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Joe Hershberger 2012-05-23 07:58:12 +00:00
parent da5ebe2c9a
commit 8d353eb86d
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
net/net.c
View File

@ -854,9 +854,9 @@ NetReceive(uchar *inpkt, int len)
{ {
struct ethernet_hdr *et; struct ethernet_hdr *et;
struct ip_udp_hdr *ip; struct ip_udp_hdr *ip;
IPaddr_t tmp; IPaddr_t dst_ip;
IPaddr_t src_ip; IPaddr_t src_ip;
int x; int eth_proto;
#if defined(CONFIG_CMD_CDP) #if defined(CONFIG_CMD_CDP)
int iscdp; int iscdp;
#endif #endif
@ -891,22 +891,22 @@ NetReceive(uchar *inpkt, int len)
if (mynvlanid == (ushort)-1) if (mynvlanid == (ushort)-1)
mynvlanid = VLAN_NONE; mynvlanid = VLAN_NONE;
x = ntohs(et->et_protlen); eth_proto = ntohs(et->et_protlen);
debug("packet received\n"); debug("packet received\n");
if (x < 1514) { if (eth_proto < 1514) {
struct e802_hdr *et802 = (struct e802_hdr *)et; struct e802_hdr *et802 = (struct e802_hdr *)et;
/* /*
* Got a 802.2 packet. Check the other protocol field. * Got a 802.2 packet. Check the other protocol field.
* XXX VLAN over 802.2+SNAP not implemented! * XXX VLAN over 802.2+SNAP not implemented!
*/ */
x = ntohs(et802->et_prot); eth_proto = ntohs(et802->et_prot);
ip = (struct ip_udp_hdr *)(inpkt + E802_HDR_SIZE); ip = (struct ip_udp_hdr *)(inpkt + E802_HDR_SIZE);
len -= E802_HDR_SIZE; len -= E802_HDR_SIZE;
} else if (x != PROT_VLAN) { /* normal packet */ } else if (eth_proto != PROT_VLAN) { /* normal packet */
ip = (struct ip_udp_hdr *)(inpkt + ETHER_HDR_SIZE); ip = (struct ip_udp_hdr *)(inpkt + ETHER_HDR_SIZE);
len -= ETHER_HDR_SIZE; len -= ETHER_HDR_SIZE;
@ -930,13 +930,13 @@ NetReceive(uchar *inpkt, int len)
cti = ntohs(vet->vet_tag); cti = ntohs(vet->vet_tag);
vlanid = cti & VLAN_IDMASK; vlanid = cti & VLAN_IDMASK;
x = ntohs(vet->vet_type); eth_proto = ntohs(vet->vet_type);
ip = (struct ip_udp_hdr *)(inpkt + VLAN_ETHER_HDR_SIZE); ip = (struct ip_udp_hdr *)(inpkt + VLAN_ETHER_HDR_SIZE);
len -= VLAN_ETHER_HDR_SIZE; len -= VLAN_ETHER_HDR_SIZE;
} }
debug("Receive from protocol 0x%x\n", x); debug("Receive from protocol 0x%x\n", eth_proto);
#if defined(CONFIG_CMD_CDP) #if defined(CONFIG_CMD_CDP)
if (iscdp) { if (iscdp) {
@ -953,7 +953,7 @@ NetReceive(uchar *inpkt, int len)
return; return;
} }
switch (x) { switch (eth_proto) {
case PROT_ARP: case PROT_ARP:
ArpReceive(et, ip, len); ArpReceive(et, ip, len);
@ -992,10 +992,10 @@ NetReceive(uchar *inpkt, int len)
return; return;
} }
/* If it is not for us, ignore it */ /* If it is not for us, ignore it */
tmp = NetReadIP(&ip->ip_dst); dst_ip = NetReadIP(&ip->ip_dst);
if (NetOurIP && tmp != NetOurIP && tmp != 0xFFFFFFFF) { if (NetOurIP && dst_ip != NetOurIP && dst_ip != 0xFFFFFFFF) {
#ifdef CONFIG_MCAST_TFTP #ifdef CONFIG_MCAST_TFTP
if (Mcast_addr != tmp) if (Mcast_addr != dst_ip)
#endif #endif
return; return;
} }