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

Commit 6654cf60 authored Oct 06, 2014 by Ivan Vecera Committed by David S. Miller Oct 07, 2014

bna: allow transmit tagged frames

When Tx VLAN offloading is disabled frames with size ~ MTU are not
transmitted as the driver does not account 4 bytes of VLAN header added
by stack. It should use VLAN_ETH_HLEN instead of ETH_HLEN.

The second problem is with newer BNA chips (BNA 1860). These chips filter
out any VLAN tagged frames in Tx path. This is a problem when Tx VLAN
offloading is disabled and frames are tagged by stack. Older chips like
1010/1020 are not affected as they probably don't do such filtering.

Cc: Rasesh Mody <rasesh.mody@qlogic.com>
Signed-off-by: Ivan Vecera <ivecera@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent bdf6fa52

drivers/net/ethernet/brocade/bna/bna_tx_rx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3410,7 +3410,7 @@ bna_bfi_tx_enet_start(struct bna_tx *tx)

		cfg_req->tx_cfg.vlan_mode = BFI_ENET_TX_VLAN_WI;
		cfg_req->tx_cfg.vlan_id = htons((u16)tx->txf_vlan_id);
		cfg_req->tx_cfg.admit_tagged_frame = BNA_STATUS_T_DISABLED;
		cfg_req->tx_cfg.admit_tagged_frame = BNA_STATUS_T_ENABLED;
		cfg_req->tx_cfg.apply_vlan_filter = BNA_STATUS_T_DISABLED;

		bfa_msgq_cmd_set(&tx->msgq_cmd, NULL, NULL,

drivers/net/ethernet/brocade/bna/bnad.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2864,7 +2864,7 @@ bnad_txq_wi_prepare(struct bnad bnad, struct bna_tcb tcb,
		txqent->hdr.wi.opcode = htons(BNA_TXQ_WI_SEND);
		txqent->hdr.wi.lso_mss = 0;

		if (unlikely(skb->len > (bnad->netdev->mtu + ETH_HLEN))) {
		if (unlikely(skb->len > (bnad->netdev->mtu + VLAN_ETH_HLEN))) {
		BNAD_UPDATE_CTR(bnad, tx_skb_non_tso_too_long);
		return -EINVAL;
		}