This is a note to let you know that I've just added the patch titled
staging: vt6656: use ieee80211_tx_info to select packet type.
to the 4.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
staging-vt6656-use-ieee80211_tx_info-to-select-packet-type.patch
and it can be found in the queue-4.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From b23f14302e86628625ac3982a6d23e35888755f2 Mon Sep 17 00:00:00 2001
From: Malcolm Priestley <tvboxspy@xxxxxxxxx>
Date: Sat, 4 Apr 2015 20:49:10 +0100
Subject: staging: vt6656: use ieee80211_tx_info to select packet type.
From: Malcolm Priestley <tvboxspy@xxxxxxxxx>
commit b23f14302e86628625ac3982a6d23e35888755f2 upstream.
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@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/staging/vt6656/rxtx.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -805,10 +805,18 @@ int vnt_tx_packet(struct vnt_private *pr
vnt_schedule_command(priv, WLAN_CMD_SETPOWER);
}
- if (current_rate > RATE_11M)
- pkt_type = priv->packet_type;
- else
+ 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);
Patches currently in stable-queue which might be from tvboxspy@xxxxxxxxx are
queue-4.0/staging-vt6655-vnt_tx_packet-correct-tx-order-of-owned_by_nic.patch
queue-4.0/staging-vt6655-device_free_tx_buf-use-only-ieee80211_tx_status_irqsafe.patch
queue-4.0/staging-vt6656-use-ieee80211_tx_info-to-select-packet-type.patch
queue-4.0/staging-vt6655-implement-ieee80211_tx_stat_noack_transmitted.patch
queue-4.0/staging-vt6655-fix-80211-control-and-management-status-reporting.patch
queue-4.0/staging-vt6655-lock-macvwritebssidaddress.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html