diff options
| author |   Kalle Valo <kvalo@qca.qualcomm.com> | 2016-09-09 15:19:40 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2016-09-09 15:19:40 +0300 |
| commit | 3cd32dde17ea938651b434fc35dee8370f555378 (patch) | |
| tree | f55e2a98eb716ba1976aeb21d02ffbea3711fd26 /drivers/net/wireless/marvell | |
| parent | carl9170: Fix wrong completion usage (diff) | |
| parent | ath9k: bring back direction setting in ath9k_{start_stop} (diff) | |
| download | linux-dev-3cd32dde17ea938651b434fc35dee8370f555378.tar.xz linux-dev-3cd32dde17ea938651b434fc35dee8370f555378.zip | |
Merge branch 'ath-current' into ath-next
Commit 3c97f5de1f28 ("ath10k: implement NAPI support") conflicts with
ath-current. To avoid any merge problems merge ath-current to ath-next already now.
Conflicts:
drivers/net/wireless/ath/ath10k/htt_rx.c
Diffstat (limited to 'drivers/net/wireless/marvell')
| -rw-r--r-- | drivers/net/wireless/marvell/mwifiex/11n_aggr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/marvell/mwifiex/11n_aggr.c b/drivers/net/wireless/marvell/mwifiex/11n_aggr.c index dc49c3de1f25..c47d6366875d 100644 --- a/drivers/net/wireless/marvell/mwifiex/11n_aggr.c +++ b/drivers/net/wireless/marvell/mwifiex/11n_aggr.c @@ -205,7 +205,8 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv, do { /* Check if AMSDU can accommodate this MSDU */ - if (skb_tailroom(skb_aggr) < (skb_src->len + LLC_SNAP_LEN)) + if ((skb_aggr->len + skb_src->len + LLC_SNAP_LEN) > + adapter->tx_buf_size) break; skb_src = skb_dequeue(&pra_list->skb_head); |