diff options
Diffstat (limited to 'net/mac80211/agg-rx.c')
| -rw-r--r-- | net/mac80211/agg-rx.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/net/mac80211/agg-rx.c b/net/mac80211/agg-rx.c index fd1aaf2a4a6c..e6cab51dceb0 100644 --- a/net/mac80211/agg-rx.c +++ b/net/mac80211/agg-rx.c | |||
| @@ -167,12 +167,8 @@ static void ieee80211_send_addba_resp(struct ieee80211_sub_if_data *sdata, u8 *d | |||
| 167 | u16 capab; | 167 | u16 capab; |
| 168 | 168 | ||
| 169 | skb = dev_alloc_skb(sizeof(*mgmt) + local->hw.extra_tx_headroom); | 169 | skb = dev_alloc_skb(sizeof(*mgmt) + local->hw.extra_tx_headroom); |
| 170 | 170 | if (!skb) | |
| 171 | if (!skb) { | ||
| 172 | printk(KERN_DEBUG "%s: failed to allocate buffer " | ||
| 173 | "for addba resp frame\n", sdata->name); | ||
| 174 | return; | 171 | return; |
| 175 | } | ||
| 176 | 172 | ||
| 177 | skb_reserve(skb, local->hw.extra_tx_headroom); | 173 | skb_reserve(skb, local->hw.extra_tx_headroom); |
| 178 | mgmt = (struct ieee80211_mgmt *) skb_put(skb, 24); | 174 | mgmt = (struct ieee80211_mgmt *) skb_put(skb, 24); |
| @@ -279,14 +275,8 @@ void ieee80211_process_addba_request(struct ieee80211_local *local, | |||
| 279 | 275 | ||
| 280 | /* prepare A-MPDU MLME for Rx aggregation */ | 276 | /* prepare A-MPDU MLME for Rx aggregation */ |
| 281 | tid_agg_rx = kmalloc(sizeof(struct tid_ampdu_rx), GFP_KERNEL); | 277 | tid_agg_rx = kmalloc(sizeof(struct tid_ampdu_rx), GFP_KERNEL); |
| 282 | if (!tid_agg_rx) { | 278 | if (!tid_agg_rx) |
| 283 | #ifdef CONFIG_MAC80211_HT_DEBUG | ||
| 284 | if (net_ratelimit()) | ||
| 285 | printk(KERN_ERR "allocate rx mlme to tid %d failed\n", | ||
| 286 | tid); | ||
| 287 | #endif | ||
| 288 | goto end; | 279 | goto end; |
| 289 | } | ||
| 290 | 280 | ||
| 291 | spin_lock_init(&tid_agg_rx->reorder_lock); | 281 | spin_lock_init(&tid_agg_rx->reorder_lock); |
| 292 | 282 | ||
| @@ -306,11 +296,6 @@ void ieee80211_process_addba_request(struct ieee80211_local *local, | |||
| 306 | tid_agg_rx->reorder_time = | 296 | tid_agg_rx->reorder_time = |
| 307 | kcalloc(buf_size, sizeof(unsigned long), GFP_KERNEL); | 297 | kcalloc(buf_size, sizeof(unsigned long), GFP_KERNEL); |
| 308 | if (!tid_agg_rx->reorder_buf || !tid_agg_rx->reorder_time) { | 298 | if (!tid_agg_rx->reorder_buf || !tid_agg_rx->reorder_time) { |
| 309 | #ifdef CONFIG_MAC80211_HT_DEBUG | ||
| 310 | if (net_ratelimit()) | ||
| 311 | printk(KERN_ERR "can not allocate reordering buffer " | ||
| 312 | "to tid %d\n", tid); | ||
| 313 | #endif | ||
| 314 | kfree(tid_agg_rx->reorder_buf); | 299 | kfree(tid_agg_rx->reorder_buf); |
| 315 | kfree(tid_agg_rx->reorder_time); | 300 | kfree(tid_agg_rx->reorder_time); |
| 316 | kfree(tid_agg_rx); | 301 | kfree(tid_agg_rx); |
