Staging: bcm: Remove typedef for _ETH_CS_ETH2_FRAME and call directly.

This patch removes typedef for _ETH_CS_ETH2_FRAME, and
changes the name of the struct to bcm_ethernet2_frame. In
addition, any calls to struct "ETH_CS_ETH2_FRAME" are
changed to call directly.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/bcm/Protocol.h b/drivers/staging/bcm/Protocol.h
index 89246b1b0a6889d57196f807fb9b4585026bbf65..79e3b249d5ae2b1c2135e06b1eacfbea56d0b854 100644 (file)
--- a/drivers/staging/bcm/Protocol.h
+++ b/drivers/staging/bcm/Protocol.h
@@ -68,9 +68,9 @@ typedef struct _ETH_CS_802_LLC_SNAP_FRAME {
        unsigned short usEtherType;
 } __packed ETH_CS_802_LLC_SNAP_FRAME;
 
-typedef struct _ETH_CS_ETH2_FRAME {
+struct bcm_ethernet2_frame {
        struct bcm_eth_header EThHdr;
-} __packed ETH_CS_ETH2_FRAME;
+} __packed;
 
 #define ETHERNET_FRAMETYPE_IPV4                ntohs(0x0800)
 #define ETHERNET_FRAMETYPE_IPV6                ntohs(0x86dd)

diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c
index 438e73da33289cbfc6367e41ac2cfe113127ab4e..11a365094dc2bbdeb32c47d1ac89d6ff499bc8d3 100644 (file)
--- a/drivers/staging/bcm/Qos.c
+++ b/drivers/staging/bcm/Qos.c
@@ -486,13 +486,13 @@ USHORT ClassifyPacket(struct bcm_mini_adapter *Adapter,struct sk_buff* skb)
                case eEthOtherFrame:
                {
                        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "ClassifyPacket : ETH Other Frame\n");
-                       pIpHeader = pvEThPayload + sizeof(ETH_CS_ETH2_FRAME);
+                       pIpHeader = pvEThPayload + sizeof(struct bcm_ethernet2_frame);
                        break;
                }
                default:
                {
                        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "ClassifyPacket : Unrecognized ETH Frame\n");
-                       pIpHeader = pvEThPayload + sizeof(ETH_CS_ETH2_FRAME);
+                       pIpHeader = pvEThPayload + sizeof(struct bcm_ethernet2_frame);
                        break;
                }
        }