diff options
author | Joe Perches <joe@perches.com> | 2011-08-29 17:17:31 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-09-13 15:45:02 -0400 |
commit | d15b84590a1d2ec021ada00a0e67ee5851a0ea2b (patch) | |
tree | 2a05aed04345641fec0647c409779345ef0166f3 /net/mac80211/tx.c | |
parent | 239289e446d4e86ae94b1ca57e358b106cc4bee6 (diff) |
mac80211: 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>
Diffstat (limited to 'net/mac80211/tx.c')
-rw-r--r-- | net/mac80211/tx.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 01072639666f..c9766ccb51a4 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c | |||
@@ -2365,11 +2365,9 @@ struct sk_buff *ieee80211_pspoll_get(struct ieee80211_hw *hw, | |||
2365 | local = sdata->local; | 2365 | local = sdata->local; |
2366 | 2366 | ||
2367 | skb = dev_alloc_skb(local->hw.extra_tx_headroom + sizeof(*pspoll)); | 2367 | skb = dev_alloc_skb(local->hw.extra_tx_headroom + sizeof(*pspoll)); |
2368 | if (!skb) { | 2368 | if (!skb) |
2369 | printk(KERN_DEBUG "%s: failed to allocate buffer for " | ||
2370 | "pspoll template\n", sdata->name); | ||
2371 | return NULL; | 2369 | return NULL; |
2372 | } | 2370 | |
2373 | skb_reserve(skb, local->hw.extra_tx_headroom); | 2371 | skb_reserve(skb, local->hw.extra_tx_headroom); |
2374 | 2372 | ||
2375 | pspoll = (struct ieee80211_pspoll *) skb_put(skb, sizeof(*pspoll)); | 2373 | pspoll = (struct ieee80211_pspoll *) skb_put(skb, sizeof(*pspoll)); |
@@ -2405,11 +2403,9 @@ struct sk_buff *ieee80211_nullfunc_get(struct ieee80211_hw *hw, | |||
2405 | local = sdata->local; | 2403 | local = sdata->local; |
2406 | 2404 | ||
2407 | skb = dev_alloc_skb(local->hw.extra_tx_headroom + sizeof(*nullfunc)); | 2405 | skb = dev_alloc_skb(local->hw.extra_tx_headroom + sizeof(*nullfunc)); |
2408 | if (!skb) { | 2406 | if (!skb) |
2409 | printk(KERN_DEBUG "%s: failed to allocate buffer for nullfunc " | ||
2410 | "template\n", sdata->name); | ||
2411 | return NULL; | 2407 | return NULL; |
2412 | } | 2408 | |
2413 | skb_reserve(skb, local->hw.extra_tx_headroom); | 2409 | skb_reserve(skb, local->hw.extra_tx_headroom); |
2414 | 2410 | ||
2415 | nullfunc = (struct ieee80211_hdr_3addr *) skb_put(skb, | 2411 | nullfunc = (struct ieee80211_hdr_3addr *) skb_put(skb, |
@@ -2444,11 +2440,8 @@ struct sk_buff *ieee80211_probereq_get(struct ieee80211_hw *hw, | |||
2444 | 2440 | ||
2445 | skb = dev_alloc_skb(local->hw.extra_tx_headroom + sizeof(*hdr) + | 2441 | skb = dev_alloc_skb(local->hw.extra_tx_headroom + sizeof(*hdr) + |
2446 | ie_ssid_len + ie_len); | 2442 | ie_ssid_len + ie_len); |
2447 | if (!skb) { | 2443 | if (!skb) |
2448 | printk(KERN_DEBUG "%s: failed to allocate buffer for probe " | ||
2449 | "request template\n", sdata->name); | ||
2450 | return NULL; | 2444 | return NULL; |
2451 | } | ||
2452 | 2445 | ||
2453 | skb_reserve(skb, local->hw.extra_tx_headroom); | 2446 | skb_reserve(skb, local->hw.extra_tx_headroom); |
2454 | 2447 | ||