diff options
| author | Joe Hershberger <joe.hershberger@ni.com> | 2012-05-23 07:58:07 +0000 |
|---|---|---|
| committer | Joe Hershberger <joe.hershberger@ni.com> | 2012-05-23 17:46:14 -0500 |
| commit | c68cca35b33c3a7c9fbcfc08de7e91dbdc8cf51f (patch) | |
| tree | 3fb8a20f452b270c121e198dec18293bad69cd5c | |
| parent | cb487f5664b1bf7d907f5d23fe10cc14dc1bd45a (diff) | |
net: cosmetic: Un-typedef VLAN_Ethernet_t
Eliminate the typedef and remove capital letters
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
| -rw-r--r-- | include/net.h | 7 | ||||
| -rw-r--r-- | net/net.c | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/include/net.h b/include/net.h index 2551516032..69dceb19f0 100644 --- a/include/net.h +++ b/include/net.h @@ -185,15 +185,16 @@ struct e802_hdr { /* * Ethernet header */ -typedef struct { +struct vlan_ethernet_hdr { uchar vet_dest[6]; /* Destination node */ uchar vet_src[6]; /* Source node */ ushort vet_vlan_type; /* PROT_VLAN */ ushort vet_tag; /* TAG of VLAN */ 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_ARP 0x0806 /* IP ARP protocol */ @@ -909,7 +909,8 @@ NetReceive(uchar *inpkt, int len) len -= ETHER_HDR_SIZE; } 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"); @@ -1232,7 +1233,8 @@ NetSetEther(uchar *xet, uchar * addr, uint prot) et->et_protlen = htons(prot); return ETHER_HDR_SIZE; } 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_tag = htons((0 << 5) | (myvlanid & VLAN_IDMASK)); |