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

Commit ed7bc602 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

bnxt_en: Pass complete VLAN TCI to the stack. 



When receiving a packet with VLAN tag, pass the entire 16-bit TCI to the
stack when calling __vlan_hwaccel_put_tag().  The current code is only
passing the 12-bit tag and it is missing the priority bits.

Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b9ecc340

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+2 −2
Original line number Diff line number Diff line
@@ -1439,7 +1439,7 @@ static inline struct sk_buff *bnxt_tpa_end(struct bnxt *bp, 
	    (skb->dev->features & NETIF_F_HW_VLAN_CTAG_RX)) {

		u16 vlan_proto = tpa_info->metadata >>

			RX_CMP_FLAGS2_METADATA_TPID_SFT;

		u16 vtag = tpa_info->metadata & RX_CMP_FLAGS2_METADATA_VID_MASK;

		u16 vtag = tpa_info->metadata & RX_CMP_FLAGS2_METADATA_TCI_MASK;



		__vlan_hwaccel_put_tag(skb, htons(vlan_proto), vtag);

	}
@@ -1623,7 +1623,7 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_napi *bnapi, u32 *raw_cons, 
	     cpu_to_le32(RX_CMP_FLAGS2_META_FORMAT_VLAN)) &&

	    (skb->dev->features & NETIF_F_HW_VLAN_CTAG_RX)) {

		u32 meta_data = le32_to_cpu(rxcmp1->rx_cmp_meta_data);

		u16 vtag = meta_data & RX_CMP_FLAGS2_METADATA_VID_MASK;

		u16 vtag = meta_data & RX_CMP_FLAGS2_METADATA_TCI_MASK;

		u16 vlan_proto = meta_data >> RX_CMP_FLAGS2_METADATA_TPID_SFT;



		__vlan_hwaccel_put_tag(skb, htons(vlan_proto), vtag);

drivers/net/ethernet/broadcom/bnxt/bnxt.h

+1 −0
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ struct rx_cmp_ext { 
	#define RX_CMP_FLAGS2_T_L4_CS_CALC			(0x1 << 3)

	#define RX_CMP_FLAGS2_META_FORMAT_VLAN			(0x1 << 4)

	__le32 rx_cmp_meta_data;

	#define RX_CMP_FLAGS2_METADATA_TCI_MASK			0xffff

	#define RX_CMP_FLAGS2_METADATA_VID_MASK			0xfff

	#define RX_CMP_FLAGS2_METADATA_TPID_MASK		0xffff0000

	 #define RX_CMP_FLAGS2_METADATA_TPID_SFT		 16