Commit b23f1430 authored Apr 04, 2015 by Malcolm Priestley Committed by Greg Kroah-Hartman May 08, 2015

staging: vt6656: 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: Malcolm Priestley <tvboxspy@gmail.com>
Cc: <stable@vger.kernel.org> # v3.17+
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent b5eed730

drivers/staging/vt6656/rxtx.c

+11 −3

Original line number	Diff line number	Diff line
		@@ -805,10 +805,18 @@ int vnt_tx_packet(struct vnt_private priv, struct sk_buff skb)
		vnt_schedule_command(priv, WLAN_CMD_SETPOWER);
		}

		if (current_rate > RATE_11M)
		pkt_type = priv->packet_type;
		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;
		}

		spin_lock_irqsave(&priv->lock, flags);