Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55ef5c89 authored by Dmitry Kravkov's avatar Dmitry Kravkov Committed by David S. Miller
Browse files

bnx2x: prevent incorrect byte-swap in BE 



Fixes incorrectly defined struct in FW HSI for BE platform.
Affects tunneling, tx-switching and anti-spoofing.

Introduced in e42780b6
    bnx2x: Utilize FW 7.10.51

Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarDmitry Kravkov <Dmitry.Kravkov@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a5325ae5

drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h

+0 −20
Original line number Diff line number Diff line
@@ -3983,29 +3983,10 @@ struct eth_mac_addresses { 


/* tunneling related data */

struct eth_tunnel_data {

#if defined(__BIG_ENDIAN)

	__le16 dst_mid;

	__le16 dst_lo;

#elif defined(__LITTLE_ENDIAN)

	__le16 dst_lo;

	__le16 dst_mid;

#endif

#if defined(__BIG_ENDIAN)

	__le16 fw_ip_hdr_csum;

	__le16 dst_hi;

#elif defined(__LITTLE_ENDIAN)

	__le16 dst_hi;

	__le16 fw_ip_hdr_csum;

#endif

#if defined(__BIG_ENDIAN)

	u8 flags;

#define ETH_TUNNEL_DATA_IP_HDR_TYPE_OUTER (0x1<<0)

#define ETH_TUNNEL_DATA_IP_HDR_TYPE_OUTER_SHIFT 0

#define ETH_TUNNEL_DATA_RESERVED (0x7F<<1)

#define ETH_TUNNEL_DATA_RESERVED_SHIFT 1

	u8 ip_hdr_start_inner_w;

	__le16 pseudo_csum;

#elif defined(__LITTLE_ENDIAN)

	__le16 pseudo_csum;

	u8 ip_hdr_start_inner_w;

	u8 flags;
@@ -4013,7 +3994,6 @@ struct eth_tunnel_data { 
#define ETH_TUNNEL_DATA_IP_HDR_TYPE_OUTER_SHIFT 0

#define ETH_TUNNEL_DATA_RESERVED (0x7F<<1)

#define ETH_TUNNEL_DATA_RESERVED_SHIFT 1

#endif

};



/* union for mac addresses and for tunneling data.