diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-05-21 16:12:39 +0200 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-05-21 16:12:39 +0200 |
| commit | b3f87b98aa3dc22cc58f970140113b270015cddb (patch) | |
| tree | c4aec5996567ad96310f61e9244e799f41bf2625 /drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c | |
| parent | NFSv4.1 resend LAYOUTGET on data server invalid layout errors (diff) | |
| parent | sunrpc: fix loss of task->tk_status after rpc_delay call in xprt_alloc_slot (diff) | |
| download | linux-b3f87b98aa3dc22cc58f970140113b270015cddb.tar.xz linux-b3f87b98aa3dc22cc58f970140113b270015cddb.zip | |
Merge branch 'bugfixes' into nfs-for-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c index 8b1a7988e176..aa7aea168138 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c +++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c @@ -374,8 +374,9 @@ static void iwl_rx_handle_rxbuf(struct iwl_trans *trans, if (WARN_ON(!rxb)) return; + rxcb.truesize = PAGE_SIZE << hw_params(trans).rx_page_order; dma_unmap_page(trans->dev, rxb->page_dma, - PAGE_SIZE << hw_params(trans).rx_page_order, + rxcb.truesize, DMA_FROM_DEVICE); rxcb._page = rxb->page; |