korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-19 18:24:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

b43: Fixup set_key handling

Browse Source 
This fixes the key handling for mac80211's new key->flags.
It also adds TX locking to the set_key handler and adds a comment why this is required.
This doesn't fix any known bugs.

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Michael Buesch 2008-12-19 21:30:52 +01:00 committed by John W. Linville
parent a73efd0a85
commit e808e586b7
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/net/wireless/b43/main.c
View File

@ -937,8 +937,7 @@ static int b43_key_write(struct b43_wldev *dev,
B43_WARN_ON(dev->key[i].keyconf == keyconf); B43_WARN_ON(dev->key[i].keyconf == keyconf);
} }
if (index < 0) { if (index < 0) {
/* Either pairwise key or address is 00:00:00:00:00:00 /* Pairwise key. Get an empty slot for the key. */
* for transmit-only keys. Search the index. */
if (b43_new_kidx_api(dev)) if (b43_new_kidx_api(dev))
sta_keys_start = 4; sta_keys_start = 4;
else else
@ -951,7 +950,7 @@ static int b43_key_write(struct b43_wldev *dev,
} }
} }
if (index < 0) { if (index < 0) {
b43err(dev->wl, "Out of hardware key memory\n"); b43warn(dev->wl, "Out of hardware key memory\n");
return -ENOSPC; return -ENOSPC;
} }
} else } else
@ -3525,7 +3524,6 @@ static int b43_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
{ {
struct b43_wl *wl = hw_to_b43_wl(hw); struct b43_wl *wl = hw_to_b43_wl(hw);
struct b43_wldev *dev; struct b43_wldev *dev;
unsigned long flags;
u8 algorithm; u8 algorithm;
u8 index; u8 index;
int err; int err;
@ -3534,7 +3532,15 @@ static int b43_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
return -ENOSPC; /* User disabled HW-crypto */ return -ENOSPC; /* User disabled HW-crypto */
mutex_lock(&wl->mutex); mutex_lock(&wl->mutex);
spin_lock_irqsave(&wl->irq_lock, flags); spin_lock_irq(&wl->irq_lock);
write_lock(&wl->tx_lock);
/* Why do we need all this locking here?
* mutex -> Every config operation must take it.
* irq_lock -> We modify the dev->key array, which is accessed
* in the IRQ handlers.
* tx_lock -> We modify the dev->key array, which is accessed
* in the TX handler.
*/
dev = wl->current_dev; dev = wl->current_dev;
err = -ENODEV; err = -ENODEV;
@ -3551,7 +3557,7 @@ static int b43_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
err = -EINVAL; err = -EINVAL;
switch (key->alg) { switch (key->alg) {
case ALG_WEP: case ALG_WEP:
if (key->keylen == 5) if (key->keylen == LEN_WEP40)
algorithm = B43_SEC_ALGO_WEP40; algorithm = B43_SEC_ALGO_WEP40;
else else
algorithm = B43_SEC_ALGO_WEP104; algorithm = B43_SEC_ALGO_WEP104;
@ -3578,17 +3584,14 @@ static int b43_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
goto out_unlock; goto out_unlock;
} }
if (is_broadcast_ether_addr(addr)) { if (key->flags & IEEE80211_KEY_FLAG_PAIRWISE) {
/* addr is FF:FF:FF:FF:FF:FF for default keys */ /* Pairwise key with an assigned MAC address. */
err = b43_key_write(dev, index, algorithm,
key->key, key->keylen, NULL, key);
} else {
/*
* either pairwise key or address is 00:00:00:00:00:00
* for transmit-only keys
*/
err = b43_key_write(dev, -1, algorithm, err = b43_key_write(dev, -1, algorithm,
key->key, key->keylen, addr, key); key->key, key->keylen, addr, key);
} else {
/* Group key */
err = b43_key_write(dev, index, algorithm,
key->key, key->keylen, NULL, key);
} }
if (err) if (err)
goto out_unlock; goto out_unlock;
@ -3620,7 +3623,8 @@ out_unlock:
addr); addr);
b43_dump_keymemory(dev); b43_dump_keymemory(dev);
} }
spin_unlock_irqrestore(&wl->irq_lock, flags); write_unlock(&wl->tx_lock);
spin_unlock_irq(&wl->irq_lock);
mutex_unlock(&wl->mutex); mutex_unlock(&wl->mutex);
return err; return err;