diff options
| author | Gleb Natapov <gleb@redhat.com> | 2013-10-17 16:04:47 +0200 |
|---|---|---|
| committer | Gleb Natapov <gleb@redhat.com> | 2013-10-17 16:41:49 +0200 |
| commit | 13acfd5715144518232d8e29acf7c76ef1b089d8 (patch) | |
| tree | 093c4311a737210bbdd3d1919f8193cb5f017241 /drivers/net/wireless/mwifiex/wmm.c | |
| parent | Merge tag 'kvm-arm-for-3.13-1' of git://git.linaro.org/people/cdall/linux-kvm... (diff) | |
| parent | Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux (diff) | |
| download | linux-13acfd5715144518232d8e29acf7c76ef1b089d8.tar.xz linux-13acfd5715144518232d8e29acf7c76ef1b089d8.zip | |
Powerpc KVM work is based on a commit after rc4.
Merging master into next to satisfy the dependencies.
Conflicts:
arch/arm/kvm/reset.c
Diffstat (limited to 'drivers/net/wireless/mwifiex/wmm.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/wmm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/mwifiex/wmm.c b/drivers/net/wireless/mwifiex/wmm.c index 2e8f9cdea54d..95fa3599b407 100644 --- a/drivers/net/wireless/mwifiex/wmm.c +++ b/drivers/net/wireless/mwifiex/wmm.c @@ -1239,8 +1239,7 @@ mwifiex_dequeue_tx_packet(struct mwifiex_adapter *adapter) if (enable_tx_amsdu && mwifiex_is_amsdu_allowed(priv, tid) && mwifiex_is_11n_aggragation_possible(priv, ptr, adapter->tx_buf_size)) - mwifiex_11n_aggregate_pkt(priv, ptr, INTF_HEADER_LEN, - ptr_index, flags); + mwifiex_11n_aggregate_pkt(priv, ptr, ptr_index, flags); /* ra_list_spinlock has been freed in mwifiex_11n_aggregate_pkt() */ else |