diff options
author | Gertjan van Wingerde <gwingerde@gmail.com> | 2010-05-08 17:40:20 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-05-10 14:56:47 -0400 |
commit | 78b8f3b0ddb061af1e3907f9c4bca76eae39f79f (patch) | |
tree | 8147984c7ebc56696420fa0055442bcfe1314b5a /drivers/net/wireless/rt2x00/rt73usb.c | |
parent | e6a8aab1648226d64772a8224df0677f555a5632 (diff) |
rt2x00: Don't check whether hardware crypto is enabled when reading RXD.
We should simply follow what the hardware told us it has done.
Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt73usb.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt73usb.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c index 1399c18bc667..6acba620971f 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.c +++ b/drivers/net/wireless/rt2x00/rt73usb.c | |||
@@ -1644,12 +1644,8 @@ static void rt73usb_fill_rxdone(struct queue_entry *entry, | |||
1644 | if (rt2x00_get_field32(word0, RXD_W0_CRC_ERROR)) | 1644 | if (rt2x00_get_field32(word0, RXD_W0_CRC_ERROR)) |
1645 | rxdesc->flags |= RX_FLAG_FAILED_FCS_CRC; | 1645 | rxdesc->flags |= RX_FLAG_FAILED_FCS_CRC; |
1646 | 1646 | ||
1647 | if (test_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags)) { | 1647 | rxdesc->cipher = rt2x00_get_field32(word0, RXD_W0_CIPHER_ALG); |
1648 | rxdesc->cipher = | 1648 | rxdesc->cipher_status = rt2x00_get_field32(word0, RXD_W0_CIPHER_ERROR); |
1649 | rt2x00_get_field32(word0, RXD_W0_CIPHER_ALG); | ||
1650 | rxdesc->cipher_status = | ||
1651 | rt2x00_get_field32(word0, RXD_W0_CIPHER_ERROR); | ||
1652 | } | ||
1653 | 1649 | ||
1654 | if (rxdesc->cipher != CIPHER_NONE) { | 1650 | if (rxdesc->cipher != CIPHER_NONE) { |
1655 | _rt2x00_desc_read(rxd, 2, &rxdesc->iv[0]); | 1651 | _rt2x00_desc_read(rxd, 2, &rxdesc->iv[0]); |