From: Kevin McKinney Date: Tue, 11 Dec 2012 02:55:03 +0000 (-0500) Subject: Staging: bcm: Remove typedef for _E_IPADDR_CONTEXT and call directly. X-Git-Tag: next-20130218~26^2~688 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dbadab2684d47cc7e67a4f06a44f3120a5a59c3f;p=karo-tx-linux.git Staging: bcm: Remove typedef for _E_IPADDR_CONTEXT and call directly. This patch removes typedef for _E_IPADDR_CONTEXT, and changes the name of the enum to bcm_ipaddr_context. In addition, any calls to enum E_IPADDR_CONTEXT are changed to call directly. Signed-off-by: Kevin McKinney Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c index 23ddc3d7c9ea..78335f972e84 100644 --- a/drivers/staging/bcm/CmHost.c +++ b/drivers/staging/bcm/CmHost.c @@ -113,7 +113,7 @@ static VOID deleteSFBySfid(struct bcm_mini_adapter *Adapter, UINT uiSearchRuleIn static inline VOID CopyIpAddrToClassifier(struct bcm_classifier_rule *pstClassifierEntry, B_UINT8 u8IpAddressLen, B_UINT8 *pu8IpAddressMaskSrc, - BOOLEAN bIpVersion6, E_IPADDR_CONTEXT eIpAddrContext) + BOOLEAN bIpVersion6, enum bcm_ipaddr_context eIpAddrContext) { int i = 0; UINT nSizeOfIPAddressInBytes = IP_LENGTH_OF_ADDRESS; diff --git a/drivers/staging/bcm/IPv6ProtocolHdr.h b/drivers/staging/bcm/IPv6ProtocolHdr.h index a4d2f8482b1b..c319680fbf13 100644 --- a/drivers/staging/bcm/IPv6ProtocolHdr.h +++ b/drivers/staging/bcm/IPv6ProtocolHdr.h @@ -71,10 +71,10 @@ typedef struct IPV6IcmpHeaderFormatTag { unsigned short usChecksum; } IPV6IcmpHeader; -typedef enum _E_IPADDR_CONTEXT { +enum bcm_ipaddr_context { eSrcIpAddress, eDestIpAddress -} E_IPADDR_CONTEXT; +}; /* Function Prototypes */