diff options
| author | Malcolm Priestley | 2015-04-01 23:32:52 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-04-03 15:12:54 +0200 |
| commit | a6388e68321a1e0a0f408379c2a36396807745b3 (patch) | |
| tree | 7fa53a5f8ab8d34ef952aefef8f25eff7b38a8e7 /drivers/staging/vt6655/rxtx.c | |
| parent | staging: vt6655: s_vGenerateTxParameter Replace PSTxBufHead with struct vnt_t... (diff) | |
| download | kernel-qcow2-linux-a6388e68321a1e0a0f408379c2a36396807745b3.tar.gz kernel-qcow2-linux-a6388e68321a1e0a0f408379c2a36396807745b3.tar.xz kernel-qcow2-linux-a6388e68321a1e0a0f408379c2a36396807745b3.zip | |
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: Malcolm Priestley <tvboxspy@gmail.com>
Cc: <stable@vger.kernel.org> # v3.19+
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6655/rxtx.c')
| -rw-r--r-- | drivers/staging/vt6655/rxtx.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 195dcc9b471c..74687761bd2e 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -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; - 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) |