openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Kevin McKinney 2012-12-22 14:27:49 -05:00 committed by Greg Kroah-Hartman
parent 4a19aaa7cb
commit 30f5b4c2e1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/bcm/Protocol.h
View File

@ -68,9 +68,9 @@ typedef struct _ETH_CS_802_LLC_SNAP_FRAME {
unsigned short usEtherType; unsigned short usEtherType;
} __packed ETH_CS_802_LLC_SNAP_FRAME; } __packed ETH_CS_802_LLC_SNAP_FRAME;
typedef struct _ETH_CS_ETH2_FRAME { struct bcm_ethernet2_frame {
struct bcm_eth_header EThHdr; struct bcm_eth_header EThHdr;
} __packed ETH_CS_ETH2_FRAME; } __packed;
#define ETHERNET_FRAMETYPE_IPV4 ntohs(0x0800) #define ETHERNET_FRAMETYPE_IPV4 ntohs(0x0800)
#define ETHERNET_FRAMETYPE_IPV6 ntohs(0x86dd) #define ETHERNET_FRAMETYPE_IPV6 ntohs(0x86dd)

4
drivers/staging/bcm/Qos.c
View File

@ -486,13 +486,13 @@ USHORT ClassifyPacket(struct bcm_mini_adapter *Adapter,struct sk_buff* skb)
case eEthOtherFrame: case eEthOtherFrame:
{ {
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "ClassifyPacket : ETH Other Frame\n"); 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; break;
} }
default: default:
{ {
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "ClassifyPacket : Unrecognized ETH Frame\n"); 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; break;
} }
} }