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: Joe Perches <joe@perches.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/net/wireless/lib80211_crypt_ccmp.c b/net/wireless/lib80211_crypt_ccmp.c
index dacb3b4b1bdbf5c786e18156064ef18253b2d46b..755738d26bb49b8b6df5537191a950c4f3ccb180 100644 (file)
--- a/net/wireless/lib80211_crypt_ccmp.c
+++ b/net/wireless/lib80211_crypt_ccmp.c
@@ -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;
        }

diff --git a/net/wireless/lib80211_crypt_tkip.c b/net/wireless/lib80211_crypt_tkip.c
index 7ea4f2b0770ecbbbbcd9c98cbd9fe690534c2bb8..38734846c19e3d0b1c0d40548623a5920ff57531 100644 (file)
--- a/net/wireless/lib80211_crypt_tkip.c
+++ b/net/wireless/lib80211_crypt_tkip.c
@@ -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;
        }

diff --git a/net/wireless/lib80211_crypt_wep.c b/net/wireless/lib80211_crypt_wep.c
index 2f265e033ae271028fdb60c2addce519d6530456..c1304018fc1c5e08247cc7882496a5688c3dcb85 100644 (file)
--- a/net/wireless/lib80211_crypt_wep.c
+++ b/net/wireless/lib80211_crypt_wep.c
@@ -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;
        }

diff --git a/net/wireless/util.c b/net/wireless/util.c
index eef82f79554dba1fdce02daddcee9178635716e3..39dbf4ad7ca17cdca7581355b5a5b0aaa6221b48 100644 (file)
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -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;
        }