+ mac80211-return-correct-error-return-from-ieee80211_wep_init.patch added to -mm tree

[akpm@linux-foundation.org]

The patch titled
     mac80211: return correct error return from ieee80211_wep_init
has been added to the -mm tree.  Its filename is
     mac80211-return-correct-error-return-from-ieee80211_wep_init.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: mac80211: return correct error return from ieee80211_wep_init
From: Jeremy Fitzhardinge <jeremy@goop.org>

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>
Cc: Jiri Slaby <jirislaby@gmail.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Michael Wu <flamingice@sourmilk.net>
Cc: "John W. Linville" <linville@tuxdriver.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 net/mac80211/main.c |    4 ++--
 net/mac80211/wep.c  |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff -puN net/mac80211/main.c~mac80211-return-correct-error-return-from-ieee80211_wep_init net/mac80211/main.c
--- a/net/mac80211/main.c~mac80211-return-correct-error-return-from-ieee80211_wep_init
+++ a/net/mac80211/main.c
@@ -1731,8 +1731,8 @@ int ieee80211_register_hw(struct ieee802
 	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;
 	}
 
diff -puN net/mac80211/wep.c~mac80211-return-correct-error-return-from-ieee80211_wep_init net/mac80211/wep.c
--- a/net/mac80211/wep.c~mac80211-return-correct-error-return-from-ieee80211_wep_init
+++ a/net/mac80211/wep.c
@@ -31,13 +31,13 @@ int ieee80211_wep_init(struct ieee80211_
 	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;
_

Patches currently in -mm which might be from jeremy@goop.org are

origin.patch
mac80211-return-correct-error-return-from-ieee80211_wep_init.patch
mm-remove-double-indirection-on-tlb-parameter-to-free_pgd_range-co.patch
page-flags-record-page-flag-overlays-explicitly.patch
page-flags-record-page-flag-overlays-explicitly-xen.patch
slub-record-page-flag-overlays-explicitly.patch
slob-record-page-flag-overlays-explicitly.patch