Messages in this thread Patch in this message | | | Date | Mon, 14 Jul 2008 12:52:08 -0700 | From | Jeremy Fitzhardinge <> | Subject | [PATCH] 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> --- net/mac80211/main.c | 4 ++-- net/mac80211/wep.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
=================================================================== --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -1741,8 +1741,8 @@ result = ieee80211_wep_init(local); if (result < 0) { - printk(KERN_DEBUG "%s: Failed to initialize wep\n", - wiphy_name(local->hw.wiphy)); + printk(KERN_DEBUG "%s: Failed to initialize wep: %d\n", + wiphy_name(local->hw.wiphy), result); goto fail_wep; } =================================================================== --- a/net/mac80211/wep.c +++ b/net/mac80211/wep.c @@ -31,13 +31,13 @@ local->wep_tx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC); 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, CRYPTO_ALG_ASYNC); if (IS_ERR(local->wep_rx_tfm)) { crypto_free_blkcipher(local->wep_tx_tfm); - return -ENOMEM; + return PTR_ERR(local->wep_rx_tfm); } return 0;
| |