rt2x00: Add RXDONE_CRYPTO_IV/ICV flags

Drivers should notify rt2x00lib when they provide
the IV/ICV data. This adds some flexibility to drivers
which can't provide all information.
	* rt2500usb provides ICV inside the frame
	* rt2800pci doesn't provide IV/ICV
	* rt2800usb doesn't provide IV/ICV

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 7fc1d766062b..6d92542fcf0d 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -636,7 +636,8 @@ void rt2x00lib_rxdone(struct rt2x00_dev *rt2x00dev,
          * provided seperately (through hardware descriptor)
          * in which case we should reinsert the data into the frame.
          */
-        if ((rxdesc.flags & RX_FLAG_IV_STRIPPED)) {
+        if ((rxdesc.dev_flags & RXDONE_CRYPTO_IV) &&
+            (rxdesc.flags & RX_FLAG_IV_STRIPPED)) {
                 rt2x00crypto_rx_insert_iv(entry->skb, align,
                                           header_length, &rxdesc);
         } else if (align) {