forked from luck/tmp_suning_uos_patched
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>
This commit is contained in:
parent
e6a8aab164
commit
78b8f3b0dd
drivers/net/wireless/rt2x00
@ -1213,11 +1213,9 @@ static void rt2500usb_fill_rxdone(struct queue_entry *entry,
|
||||
if (rt2x00_get_field32(word0, RXD_W0_PHYSICAL_ERROR))
|
||||
rxdesc->flags |= RX_FLAG_FAILED_PLCP_CRC;
|
||||
|
||||
if (test_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags)) {
|
||||
rxdesc->cipher = rt2x00_get_field32(word0, RXD_W0_CIPHER);
|
||||
if (rt2x00_get_field32(word0, RXD_W0_CIPHER_ERROR))
|
||||
rxdesc->cipher_status = RX_CRYPTO_FAIL_KEY;
|
||||
}
|
||||
rxdesc->cipher = rt2x00_get_field32(word0, RXD_W0_CIPHER);
|
||||
if (rt2x00_get_field32(word0, RXD_W0_CIPHER_ERROR))
|
||||
rxdesc->cipher_status = RX_CRYPTO_FAIL_KEY;
|
||||
|
||||
if (rxdesc->cipher != CIPHER_NONE) {
|
||||
_rt2x00_desc_read(rxd, 2, &rxdesc->iv[0]);
|
||||
|
@ -840,16 +840,13 @@ static void rt2800pci_fill_rxdone(struct queue_entry *entry,
|
||||
if (rt2x00_get_field32(rxd3, RXD_W3_CRC_ERROR))
|
||||
rxdesc->flags |= RX_FLAG_FAILED_FCS_CRC;
|
||||
|
||||
if (test_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags)) {
|
||||
/*
|
||||
* Unfortunately we don't know the cipher type used during
|
||||
* decryption. This prevents us from correct providing
|
||||
* correct statistics through debugfs.
|
||||
*/
|
||||
rxdesc->cipher = rt2x00_get_field32(rxwi0, RXWI_W0_UDF);
|
||||
rxdesc->cipher_status =
|
||||
rt2x00_get_field32(rxd3, RXD_W3_CIPHER_ERROR);
|
||||
}
|
||||
/*
|
||||
* Unfortunately we don't know the cipher type used during
|
||||
* decryption. This prevents us from correct providing
|
||||
* correct statistics through debugfs.
|
||||
*/
|
||||
rxdesc->cipher = rt2x00_get_field32(rxwi0, RXWI_W0_UDF);
|
||||
rxdesc->cipher_status = rt2x00_get_field32(rxd3, RXD_W3_CIPHER_ERROR);
|
||||
|
||||
if (rt2x00_get_field32(rxd3, RXD_W3_DECRYPTED)) {
|
||||
/*
|
||||
|
@ -549,7 +549,6 @@ static void rt2800usb_kick_tx_queue(struct rt2x00_dev *rt2x00dev,
|
||||
static void rt2800usb_fill_rxdone(struct queue_entry *entry,
|
||||
struct rxdone_entry_desc *rxdesc)
|
||||
{
|
||||
struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
|
||||
struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);
|
||||
__le32 *rxi = (__le32 *)entry->skb->data;
|
||||
__le32 *rxwi;
|
||||
@ -595,11 +594,8 @@ static void rt2800usb_fill_rxdone(struct queue_entry *entry,
|
||||
if (rt2x00_get_field32(rxd0, RXD_W0_CRC_ERROR))
|
||||
rxdesc->flags |= RX_FLAG_FAILED_FCS_CRC;
|
||||
|
||||
if (test_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags)) {
|
||||
rxdesc->cipher = rt2x00_get_field32(rxwi0, RXWI_W0_UDF);
|
||||
rxdesc->cipher_status =
|
||||
rt2x00_get_field32(rxd0, RXD_W0_CIPHER_ERROR);
|
||||
}
|
||||
rxdesc->cipher = rt2x00_get_field32(rxwi0, RXWI_W0_UDF);
|
||||
rxdesc->cipher_status = rt2x00_get_field32(rxd0, RXD_W0_CIPHER_ERROR);
|
||||
|
||||
if (rt2x00_get_field32(rxd0, RXD_W0_DECRYPTED)) {
|
||||
/*
|
||||
|
@ -1968,12 +1968,8 @@ static void rt61pci_fill_rxdone(struct queue_entry *entry,
|
||||
if (rt2x00_get_field32(word0, RXD_W0_CRC_ERROR))
|
||||
rxdesc->flags |= RX_FLAG_FAILED_FCS_CRC;
|
||||
|
||||
if (test_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags)) {
|
||||
rxdesc->cipher =
|
||||
rt2x00_get_field32(word0, RXD_W0_CIPHER_ALG);
|
||||
rxdesc->cipher_status =
|
||||
rt2x00_get_field32(word0, RXD_W0_CIPHER_ERROR);
|
||||
}
|
||||
rxdesc->cipher = rt2x00_get_field32(word0, RXD_W0_CIPHER_ALG);
|
||||
rxdesc->cipher_status = rt2x00_get_field32(word0, RXD_W0_CIPHER_ERROR);
|
||||
|
||||
if (rxdesc->cipher != CIPHER_NONE) {
|
||||
_rt2x00_desc_read(entry_priv->desc, 2, &rxdesc->iv[0]);
|
||||
|
@ -1644,12 +1644,8 @@ static void rt73usb_fill_rxdone(struct queue_entry *entry,
|
||||
if (rt2x00_get_field32(word0, RXD_W0_CRC_ERROR))
|
||||
rxdesc->flags |= RX_FLAG_FAILED_FCS_CRC;
|
||||
|
||||
if (test_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags)) {
|
||||
rxdesc->cipher =
|
||||
rt2x00_get_field32(word0, RXD_W0_CIPHER_ALG);
|
||||
rxdesc->cipher_status =
|
||||
rt2x00_get_field32(word0, RXD_W0_CIPHER_ERROR);
|
||||
}
|
||||
rxdesc->cipher = rt2x00_get_field32(word0, RXD_W0_CIPHER_ALG);
|
||||
rxdesc->cipher_status = rt2x00_get_field32(word0, RXD_W0_CIPHER_ERROR);
|
||||
|
||||
if (rxdesc->cipher != CIPHER_NONE) {
|
||||
_rt2x00_desc_read(rxd, 2, &rxdesc->iv[0]);
|
||||
|
Loading…
Reference in New Issue
Block a user