hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This patch removes typedef for _ETH_CS_802_LLC_SNAP_FRAME, and
changes the name of the struct to bcm_eth_llc_snap_frame. In
addition, any calls to struct "ETH_CS_802_LLC_SNAP_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:50 -05:00 committed by Greg Kroah-Hartman
parent 30f5b4c2e1
commit 9bcacc2975
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

@ -59,14 +59,14 @@ typedef struct _ETH_CS_802_LLC_FRAME {
unsigned char Control;
} __packed ETH_CS_802_LLC_FRAME;
typedef struct _ETH_CS_802_LLC_SNAP_FRAME {
struct bcm_eth_llc_snap_frame {
struct bcm_eth_header EThHdr;
unsigned char DSAP;
unsigned char SSAP;
unsigned char Control;
unsigned char OUI[3];
unsigned short usEtherType;
} __packed ETH_CS_802_LLC_SNAP_FRAME;
} __packed;
struct bcm_ethernet2_frame {
struct bcm_eth_header EThHdr;

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

@ -474,7 +474,7 @@ USHORT ClassifyPacket(struct bcm_mini_adapter *Adapter,struct sk_buff* skb)
case eEth802LLCSNAPFrame:
{
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "ClassifyPacket : 802LLC SNAP Frame\n");
pIpHeader = pvEThPayload + sizeof(ETH_CS_802_LLC_SNAP_FRAME);
pIpHeader = pvEThPayload + sizeof(struct bcm_eth_llc_snap_frame);
break;
}
case eEth802QVLANFrame:
@ -835,7 +835,7 @@ static void EThCSGetPktInfo(struct bcm_mini_adapter *Adapter,PVOID pvEthPayload,
{
//SNAP Frame
pstEthCsPktInfo->eNwpktEthFrameType = eEth802LLCSNAPFrame;
u16Etype = ((ETH_CS_802_LLC_SNAP_FRAME*)pvEthPayload)->usEtherType;
u16Etype = ((struct bcm_eth_llc_snap_frame *)pvEthPayload)->usEtherType;
}
}
if(u16Etype == ETHERNET_FRAMETYPE_IPV4)