staging: vt6656: vnt_rx_data add track rsr and new_rsr errors
authorMalcolm Priestley <tvboxspy@gmail.com>
Sat, 5 Jul 2014 18:24:24 +0000 (19:24 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 8 Jul 2014 23:03:57 +0000 (16:03 -0700)
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>
drivers/staging/vt6656/dpc.c

index ca5555482377d6fe6cb23feebf28eff76a71bbdb..f3da0db77c042c38573a3a433a8779397fbf3e30 100644 (file)
@@ -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));