diff options
| author | Malcolm Priestley | 2014-07-05 20:24:24 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-07-09 01:03:57 +0200 |
| commit | 47b41d9f44da5ff32121b9d47f6ba8b5daab5b53 (patch) | |
| tree | b77056cd6281ec70fb961a5aeb3fd93e37d27811 /drivers/staging/vt6656/dpc.c | |
| parent | staging: vt6656: vnt_tx_packet don't change power when off channel. (diff) | |
| download | kernel-qcow2-linux-47b41d9f44da5ff32121b9d47f6ba8b5daab5b53.tar.gz kernel-qcow2-linux-47b41d9f44da5ff32121b9d47f6ba8b5daab5b53.tar.xz kernel-qcow2-linux-47b41d9f44da5ff32121b9d47f6ba8b5daab5b53.zip | |
staging: vt6656: vnt_rx_data add track rsr and new_rsr errors
Add rsr and new_rsr error packet error drop.
if NEWRSR_DECRYPTOK fails drop packet altogether.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6656/dpc.c')
| -rw-r--r-- | drivers/staging/vt6656/dpc.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c index ca5555482377..f3da0db77c04 100644 --- a/drivers/staging/vt6656/dpc.c +++ b/drivers/staging/vt6656/dpc.c @@ -143,7 +143,10 @@ int vnt_rx_data(struct vnt_private *priv, struct vnt_rcb *ptr_rcb, new_rsr = skb_data + 8 + pay_load_with_padding + 9; rssi = skb_data + 8 + pay_load_with_padding + 10; + rsr = skb_data + 8 + pay_load_with_padding + 11; + if (*rsr & (RSR_IVLDTYP | RSR_IVLDLEN)) + return false; frame_size = *pay_load_len; @@ -163,14 +166,24 @@ int vnt_rx_data(struct vnt_private *priv, struct vnt_rcb *ptr_rcb, rx_status.flag = 0; rx_status.freq = hw->conf.chandef.chan->center_freq; + if (!(*rsr & RSR_CRCOK)) + rx_status.flag |= RX_FLAG_FAILED_FCS_CRC; + hdr = (struct ieee80211_hdr *)(skb->data); fc = hdr->frame_control; rx_status.rate_idx = rate_idx; if (ieee80211_has_protected(fc)) { - if (priv->byLocalID > REV_ID_VT3253_A1) - rx_status.flag = RX_FLAG_DECRYPTED; + if (priv->byLocalID > REV_ID_VT3253_A1) { + rx_status.flag |= RX_FLAG_DECRYPTED; + + /* Drop packet */ + if (!(*new_rsr & NEWRSR_DECRYPTOK)) { + dev_kfree_skb(skb); + return true; + } + } } memcpy(IEEE80211_SKB_RXCB(skb), &rx_status, sizeof(rx_status)); |