--- drivers/net/wireless/rt2x00/rt2500usb.c

+++ drivers/net/wireless/rt2x00/rt2500usb.c

@@ -347,6 +347,7 @@ static int rt2500usb_config_key(struct r

int timeout;

u32 mask;

u16 reg;

+ enum cipher curr_cipher;

if (crypto->cmd == SET_KEY) {

/*

@@ -357,6 +358,7 @@ static int rt2500usb_config_key(struct r

mask = TXRX_CSR0_KEY_ID.bit_mask;

rt2500usb_register_read(rt2x00dev, TXRX_CSR0, &reg);

+ curr_cipher = rt2x00_get_field16(reg, TXRX_CSR0_ALGORITHM);

reg &= mask;

if (reg && reg == mask)

@@ -365,6 +367,14 @@ static int rt2500usb_config_key(struct r

reg = rt2x00_get_field16(reg, TXRX_CSR0_KEY_ID);

key->hw_key_idx += reg ? ffz(reg) : 0;

+ /*

+ * Hardware requires that all keys use the same cipher

+ * (e.g. TKIP-only, AES-only, but not TKIP+AES).

+ * If this is not the first key, compare the cipher with the

+ * first one and fall back to SW crypto if not the same.

+ */

+ if (key->hw_key_idx > 0 && crypto->cipher != curr_cipher)

+ return -EOPNOTSUPP;

/*

* The encryption key doesn't fit within the CSR cache,

@@ -1788,8 +1798,6 @@ static int rt2500usb_probe_hw_mode(struc

IEEE80211_HW_SUPPORTS_PS |

IEEE80211_HW_PS_NULLFUNC_STACK;

- rt2x00dev->hw->extra_tx_headroom = TXD_DESC_SIZE;

-

SET_IEEE80211_DEV(rt2x00dev->hw, rt2x00dev->dev);

SET_IEEE80211_PERM_ADDR(rt2x00dev->hw,

rt2x00_eeprom_addr(rt2x00dev,

@@ -1962,6 +1970,7 @@ static const struct rt2x00_ops rt2500usb

.eeprom_size = EEPROM_SIZE,

.rf_size = RF_SIZE,

.tx_queues = NUM_TX_QUEUES,

+ .extra_tx_headroom = TXD_DESC_SIZE,

.rx = &rt2500usb_queue_rx,

.tx = &rt2500usb_queue_tx,

.bcn = &rt2500usb_queue_bcn,