Skip to content

Commit

Permalink
Staging: bcm: Remove typedef for _ETH_CS_ETH2_FRAME and call directly.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kevin McKinney authored and Greg Kroah-Hartman committed Jan 7, 2013
1 parent 4a19aaa commit 30f5b4c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/bcm/Protocol.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/bcm/Qos.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down

0 comments on commit 30f5b4c

Please sign in to comment.