mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 13:53:33 +00:00
mac80211: return correct error return from ieee80211_wep_init
Return the proper error code rather than a hard-coded ENOMEM from ieee80211_wep_init. Also, print the error code on failure. Signed-off-by: Jeremy Fitzhardinge <jeremy@goop.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
1b0241656b
commit
023a04bebe
2 changed files with 4 additions and 4 deletions
|
@ -1731,8 +1731,8 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
|
||||||
result = ieee80211_wep_init(local);
|
result = ieee80211_wep_init(local);
|
||||||
|
|
||||||
if (result < 0) {
|
if (result < 0) {
|
||||||
printk(KERN_DEBUG "%s: Failed to initialize wep\n",
|
printk(KERN_DEBUG "%s: Failed to initialize wep: %d\n",
|
||||||
wiphy_name(local->hw.wiphy));
|
wiphy_name(local->hw.wiphy), result);
|
||||||
goto fail_wep;
|
goto fail_wep;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -31,13 +31,13 @@ int ieee80211_wep_init(struct ieee80211_local *local)
|
||||||
local->wep_tx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0,
|
local->wep_tx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0,
|
||||||
CRYPTO_ALG_ASYNC);
|
CRYPTO_ALG_ASYNC);
|
||||||
if (IS_ERR(local->wep_tx_tfm))
|
if (IS_ERR(local->wep_tx_tfm))
|
||||||
return -ENOMEM;
|
return PTR_ERR(local->wep_tx_tfm);
|
||||||
|
|
||||||
local->wep_rx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0,
|
local->wep_rx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0,
|
||||||
CRYPTO_ALG_ASYNC);
|
CRYPTO_ALG_ASYNC);
|
||||||
if (IS_ERR(local->wep_rx_tfm)) {
|
if (IS_ERR(local->wep_rx_tfm)) {
|
||||||
crypto_free_blkcipher(local->wep_tx_tfm);
|
crypto_free_blkcipher(local->wep_tx_tfm);
|
||||||
return -ENOMEM;
|
return PTR_ERR(local->wep_rx_tfm);
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in a new issue