Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24616152 authored by Joe Perches's avatar Joe Perches Committed by John W. Linville
Browse files

wireless: Remove unnecessary OOM logging messages 



Removing unnecessary messages saves code and text.

Site specific OOM messages are duplications of a generic MM
out of memory message and aren't really useful, so just
delete them.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 246c0812

net/wireless/lib80211_crypt_ccmp.c

+0 −2
Original line number Diff line number Diff line
@@ -77,8 +77,6 @@ static void *lib80211_ccmp_init(int key_idx) 


	priv->tfm = crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC);

	if (IS_ERR(priv->tfm)) {

		printk(KERN_DEBUG "lib80211_crypt_ccmp: could not allocate "

		       "crypto API aes\n");

		priv->tfm = NULL;

		goto fail;

	}

net/wireless/lib80211_crypt_tkip.c

+0 −4
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ static void *lib80211_tkip_init(int key_idx) 
	priv->tx_tfm_arc4 = crypto_alloc_blkcipher("ecb(arc4)", 0,

						CRYPTO_ALG_ASYNC);

	if (IS_ERR(priv->tx_tfm_arc4)) {

		printk(KERN_DEBUG pr_fmt("could not allocate crypto API arc4\n"));

		priv->tx_tfm_arc4 = NULL;

		goto fail;

	}
@@ -109,7 +108,6 @@ static void *lib80211_tkip_init(int key_idx) 
	priv->tx_tfm_michael = crypto_alloc_hash("michael_mic", 0,

						 CRYPTO_ALG_ASYNC);

	if (IS_ERR(priv->tx_tfm_michael)) {

		printk(KERN_DEBUG pr_fmt("could not allocate crypto API michael_mic\n"));

		priv->tx_tfm_michael = NULL;

		goto fail;

	}
@@ -117,7 +115,6 @@ static void *lib80211_tkip_init(int key_idx) 
	priv->rx_tfm_arc4 = crypto_alloc_blkcipher("ecb(arc4)", 0,

						CRYPTO_ALG_ASYNC);

	if (IS_ERR(priv->rx_tfm_arc4)) {

		printk(KERN_DEBUG pr_fmt("could not allocate crypto API arc4\n"));

		priv->rx_tfm_arc4 = NULL;

		goto fail;

	}
@@ -125,7 +122,6 @@ static void *lib80211_tkip_init(int key_idx) 
	priv->rx_tfm_michael = crypto_alloc_hash("michael_mic", 0,

						 CRYPTO_ALG_ASYNC);

	if (IS_ERR(priv->rx_tfm_michael)) {

		printk(KERN_DEBUG pr_fmt("could not allocate crypto API michael_mic\n"));

		priv->rx_tfm_michael = NULL;

		goto fail;

	}

net/wireless/lib80211_crypt_wep.c

+0 −4
Original line number Diff line number Diff line
@@ -50,16 +50,12 @@ static void *lib80211_wep_init(int keyidx) 


	priv->tx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC);

	if (IS_ERR(priv->tx_tfm)) {

		printk(KERN_DEBUG "lib80211_crypt_wep: could not allocate "

		       "crypto API arc4\n");

		priv->tx_tfm = NULL;

		goto fail;

	}



	priv->rx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC);

	if (IS_ERR(priv->rx_tfm)) {

		printk(KERN_DEBUG "lib80211_crypt_wep: could not allocate "

		       "crypto API arc4\n");

		priv->rx_tfm = NULL;

		goto fail;

	}

net/wireless/util.c

+2 −3
Original line number Diff line number Diff line
@@ -513,10 +513,9 @@ int ieee80211_data_from_8023(struct sk_buff *skb, const u8 *addr, 
		if (head_need)

			skb_orphan(skb);



		if (pskb_expand_head(skb, head_need, 0, GFP_ATOMIC)) {

			pr_err("failed to reallocate Tx buffer\n");

		if (pskb_expand_head(skb, head_need, 0, GFP_ATOMIC))

			return -ENOMEM;

		}



		skb->truesize += head_need;

	}