From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:41032 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751693AbbEBM7G (ORCPT ); Sat, 2 May 2015 08:59:06 -0400 Subject: Patch "staging: vt6655: use ieee80211_tx_info to select packet type." has been added to the 3.19-stable tree To: tvboxspy@gmail.com, gregkh@linuxfoundation.org Cc: , From: Date: Sat, 02 May 2015 14:58:08 +0200 Message-ID: <143057148824556@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled staging: vt6655: use ieee80211_tx_info to select packet type. to the 3.19-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-vt6655-use-ieee80211_tx_info-to-select-packet-type.patch and it can be found in the queue-3.19 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From a6388e68321a1e0a0f408379c2a36396807745b3 Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Wed, 1 Apr 2015 22:32:52 +0100 Subject: staging: vt6655: use ieee80211_tx_info to select packet type. From: Malcolm Priestley commit a6388e68321a1e0a0f408379c2a36396807745b3 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/rxtx.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -1309,10 +1309,18 @@ int vnt_generate_fifo_header(struct vnt_ priv->hw->conf.chandef.chan->hw_value); } - if (current_rate > RATE_11M) - pkt_type = (u8)priv->byPacketType; - 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; + } /*Set fifo controls */ if (pkt_type == PK_TYPE_11A) Patches currently in stable-queue which might be from tvboxspy@gmail.com are queue-3.19/staging-vt6655-use-ieee80211_tx_info-to-select-packet-type.patch