Skip to contentSkip to conversation

mac80211: return correct error return from ieee80211_wep_init

PATCH New Jeremy Fitzhardinge 1 participant 1 message Jul 14, 2008

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---

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

===================================================================

net/mac80211/main.c +0 -0
@@ -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;
	}

===================================================================

net/mac80211/wep.c +0 -0
@@ -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;