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/mlme.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/mlme.c')
-rw-r--r-- | net/mac80211/mlme.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 60a6f273cd30..fb2f0f986de7 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
@@ -271,11 +271,9 @@ static void ieee80211_send_deauth_disassoc(struct ieee80211_sub_if_data *sdata, | |||
271 | struct ieee80211_mgmt *mgmt; | 271 | struct ieee80211_mgmt *mgmt; |
272 | 272 | ||
273 | skb = dev_alloc_skb(local->hw.extra_tx_headroom + sizeof(*mgmt)); | 273 | skb = dev_alloc_skb(local->hw.extra_tx_headroom + sizeof(*mgmt)); |
274 | if (!skb) { | 274 | if (!skb) |
275 | printk(KERN_DEBUG "%s: failed to allocate buffer for " | ||
276 | "deauth/disassoc frame\n", sdata->name); | ||
277 | return; | 275 | return; |
278 | } | 276 | |
279 | skb_reserve(skb, local->hw.extra_tx_headroom); | 277 | skb_reserve(skb, local->hw.extra_tx_headroom); |
280 | 278 | ||
281 | mgmt = (struct ieee80211_mgmt *) skb_put(skb, 24); | 279 | mgmt = (struct ieee80211_mgmt *) skb_put(skb, 24); |
@@ -354,11 +352,9 @@ static void ieee80211_send_4addr_nullfunc(struct ieee80211_local *local, | |||
354 | return; | 352 | return; |
355 | 353 | ||
356 | skb = dev_alloc_skb(local->hw.extra_tx_headroom + 30); | 354 | skb = dev_alloc_skb(local->hw.extra_tx_headroom + 30); |
357 | if (!skb) { | 355 | if (!skb) |
358 | printk(KERN_DEBUG "%s: failed to allocate buffer for 4addr " | ||
359 | "nullfunc frame\n", sdata->name); | ||
360 | return; | 356 | return; |
361 | } | 357 | |
362 | skb_reserve(skb, local->hw.extra_tx_headroom); | 358 | skb_reserve(skb, local->hw.extra_tx_headroom); |
363 | 359 | ||
364 | nullfunc = (struct ieee80211_hdr *) skb_put(skb, 30); | 360 | nullfunc = (struct ieee80211_hdr *) skb_put(skb, 30); |
@@ -2441,11 +2437,8 @@ static int ieee80211_pre_assoc(struct ieee80211_sub_if_data *sdata, | |||
2441 | int err; | 2437 | int err; |
2442 | 2438 | ||
2443 | sta = sta_info_alloc(sdata, bssid, GFP_KERNEL); | 2439 | sta = sta_info_alloc(sdata, bssid, GFP_KERNEL); |
2444 | if (!sta) { | 2440 | if (!sta) |
2445 | printk(KERN_DEBUG "%s: failed to alloc STA entry for" | ||
2446 | " the AP\n", sdata->name); | ||
2447 | return -ENOMEM; | 2441 | return -ENOMEM; |
2448 | } | ||
2449 | 2442 | ||
2450 | sta->dummy = true; | 2443 | sta->dummy = true; |
2451 | 2444 | ||