leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: cosmetic: Un-typedef VLAN_Ethernet_t

Browse Source 
Eliminate the typedef and remove capital letters

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Joe Hershberger 2012-05-23 07:58:07 +00:00
parent cb487f5664
commit c68cca35b3
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/net.h
View File

@ -185,15 +185,16 @@ struct e802_hdr {
/* /*
* Ethernet header * Ethernet header
*/ */
typedef struct { struct vlan_ethernet_hdr {
uchar vet_dest[6]; /* Destination node */ uchar vet_dest[6]; /* Destination node */
uchar vet_src[6]; /* Source node */ uchar vet_src[6]; /* Source node */
ushort vet_vlan_type; /* PROT_VLAN */ ushort vet_vlan_type; /* PROT_VLAN */
ushort vet_tag; /* TAG of VLAN */ ushort vet_tag; /* TAG of VLAN */
ushort vet_type; /* protocol type */ ushort vet_type; /* protocol type */
} VLAN_Ethernet_t; };
#define VLAN_ETHER_HDR_SIZE 18 /* VLAN Ethernet header size */ /* VLAN Ethernet header size */
#define VLAN_ETHER_HDR_SIZE (sizeof(struct vlan_ethernet_hdr))
#define PROT_IP 0x0800 /* IP protocol */ #define PROT_IP 0x0800 /* IP protocol */
#define PROT_ARP 0x0806 /* IP ARP protocol */ #define PROT_ARP 0x0806 /* IP ARP protocol */

6
net/net.c
View File

@ -909,7 +909,8 @@ NetReceive(uchar *inpkt, int len)
len -= ETHER_HDR_SIZE; len -= ETHER_HDR_SIZE;
} else { /* VLAN packet */ } else { /* VLAN packet */
VLAN_Ethernet_t *vet = (VLAN_Ethernet_t *)et; struct vlan_ethernet_hdr *vet =
(struct vlan_ethernet_hdr *)et;
debug("VLAN packet received\n"); debug("VLAN packet received\n");
@ -1232,7 +1233,8 @@ NetSetEther(uchar *xet, uchar * addr, uint prot)
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; struct vlan_ethernet_hdr *vet =
(struct vlan_ethernet_hdr *)xet;
vet->vet_vlan_type = htons(PROT_VLAN); vet->vet_vlan_type = htons(PROT_VLAN);
vet->vet_tag = htons((0 << 5) | (myvlanid & VLAN_IDMASK)); vet->vet_tag = htons((0 << 5) | (myvlanid & VLAN_IDMASK));