From: Kevin McKinney Date: Sat, 22 Dec 2012 19:27:55 +0000 (-0500) Subject: Staging: bcm: Remove typedef for _E_NWPKT_IPFRAME_TYPE and call directly. X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=8ab19921143e69797343e972b16378171f37385a;p=deliverable%2Flinux.git Staging: bcm: Remove typedef for _E_NWPKT_IPFRAME_TYPE and call directly. This patch removes typedef for _E_NWPKT_IPFRAME_TYPE, and changes the name of the enum to bcm_ip_frame_type. In addition, any calls to enum "E_NWPKT_IPFRAME_TYPE" are changed to call directly. Signed-off-by: Kevin McKinney Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/bcm/Protocol.h b/drivers/staging/bcm/Protocol.h index 494cdb1b5535..adfa48d4da3c 100644 --- a/drivers/staging/bcm/Protocol.h +++ b/drivers/staging/bcm/Protocol.h @@ -23,11 +23,11 @@ struct TransportHeaderT { } __packed; typedef struct TransportHeaderT xporthdr; -typedef enum _E_NWPKT_IPFRAME_TYPE { +enum bcm_ip_frame_type { eNonIPPacket, eIPv4Packet, eIPv6Packet -} E_NWPKT_IPFRAME_TYPE; +}; enum bcm_eth_frame_type { eEthUnsupportedFrame, @@ -38,7 +38,7 @@ enum bcm_eth_frame_type { }; struct bcm_eth_packet_info { - E_NWPKT_IPFRAME_TYPE eNwpktIPFrameType; + enum bcm_ip_frame_type eNwpktIPFrameType; enum bcm_eth_frame_type eNwpktEthFrameType; unsigned short usEtherType; unsigned char ucDSAP;