From 16a35380e882629e228b383a5bad3b688cc2becd Mon Sep 17 00:00:00 2001 From: Ron Rindjunsky Date: Thu, 12 Jun 2008 15:42:29 +0300 Subject: [PATCH] --- yaml --- r: 102951 b: refs/heads/master c: 8d5e0d58b39eed9b0f1064f4a7f2b215869b7e71 h: refs/heads/master i: 102949: 78bf4e76938f8a50f6796b0a700483bbefe86007 102947: 33bb1283809eec68b793b14ba7128f6d8fb024dc 102943: 3c70cb3e71e5928901d7254627c4b4cbe5ab366f v: v3 --- [refs] | 2 +- trunk/net/mac80211/tx.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3b4c847df7d2..0bbcd8fd1466 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58d0f3610e0c1fd31a2ff3b89879211727292771 +refs/heads/master: 8d5e0d58b39eed9b0f1064f4a7f2b215869b7e71 diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c index 1ad9e664f287..195cb6dd02a0 100644 --- a/trunk/net/mac80211/tx.c +++ b/trunk/net/mac80211/tx.c @@ -660,9 +660,8 @@ ieee80211_tx_h_fragment(struct ieee80211_tx_data *tx) /* * Warn when submitting a fragmented A-MPDU frame and drop it. - * This is an error and needs to be fixed elsewhere, but when - * done needs to take care of monitor interfaces (injection) - * etc. + * This scenario is handled in __ieee80211_tx_prepare but extra + * caution taken here as fragmented ampdu may cause Tx stop. */ if (WARN_ON(tx->flags & IEEE80211_TX_CTL_AMPDU || skb_get_queue_mapping(tx->skb) >= @@ -981,7 +980,8 @@ __ieee80211_tx_prepare(struct ieee80211_tx_data *tx, if (tx->flags & IEEE80211_TX_FRAGMENTED) { if ((tx->flags & IEEE80211_TX_UNICAST) && skb->len + FCS_LEN > local->fragmentation_threshold && - !local->ops->set_frag_threshold) + !local->ops->set_frag_threshold && + !(info->flags & IEEE80211_TX_CTL_AMPDU)) tx->flags |= IEEE80211_TX_FRAGMENTED; else tx->flags &= ~IEEE80211_TX_FRAGMENTED;