diff mbox

[U-Boot,v3,11/21] net: cosmetic: Un-typedef VLAN_Ethernet_t

Message ID 1337795897-19231-12-git-send-email-joe.hershberger@ni.com
State Accepted
Commit c68cca35b33c3a7c9fbcfc08de7e91dbdc8cf51f
Delegated to: Joe Hershberger
Headers show

Commit Message

Joe Hershberger May 23, 2012, 5:58 p.m. UTC 
Eliminate the typedef and remove capital letters

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Cc: Joe Hershberger <joe.hershberger@gmail.com>
---
Changes for v2:
   - Split apart from "Un-typedef variables in net"
   - Renamed structs from *_t to *_hdr since they are nolonger types
Changes for v3:
   - Renamed VLAN_Ethernet_hdr to vlan_ethernet_hdr

 include/net.h |    7 ++++---
 net/net.c     |    6 ++++--
 2 files changed, 8 insertions(+), 5 deletions(-)
diff mbox

Patch

diff --git a/include/net.h b/include/net.h
index 2551516..69dceb1 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		*/
diff --git a/net/net.c b/net/net.c
index 33de399..6d34254 100644
--- a/net/net.c
+++ b/net/net.c
@@ -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));