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

Commit a6388e68 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6655: use ieee80211_tx_info to select packet type. 



Information for packet type is in ieee80211_tx_info

band IEEE80211_BAND_5GHZ for PK_TYPE_11A.

IEEE80211_TX_RC_USE_CTS_PROTECT via tx_rate flags selects PK_TYPE_11GB

This ensures that the packet is always the right type.

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Cc: <stable@vger.kernel.org> # v3.19+
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent df184806

drivers/staging/vt6655/rxtx.c

+11 −3
Original line number Diff line number Diff line
@@ -1305,10 +1305,18 @@ int vnt_generate_fifo_header(struct vnt_private *priv, u32 dma_idx, 
			    priv->hw->conf.chandef.chan->hw_value);

	}



	if (current_rate > RATE_11M)

		pkt_type = (u8)priv->byPacketType;

	if (current_rate > RATE_11M) {

		if (info->band == IEEE80211_BAND_5GHZ) {

			pkt_type = PK_TYPE_11A;

		} else {

			if (tx_rate->flags & IEEE80211_TX_RC_USE_CTS_PROTECT)

				pkt_type = PK_TYPE_11GB;

			else

				pkt_type = PK_TYPE_11GA;

		}

	} else {

		pkt_type = PK_TYPE_11B;

	}



	/*Set fifo controls */

	if (pkt_type == PK_TYPE_11A)