From: David S. Miller Date: Tue, 8 Oct 2013 20:10:10 +0000 (-0400) Subject: Merge branch 'mlx4' X-Git-Tag: v3.12-rc7~20^2~56 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=3c01352db3868aab6c6e6402c2cfb781f7755504;p=linux-block.git Merge branch 'mlx4' Amir Vadai says: ==================== net/mlx4_en: Fix pages never dma unmapped on rx This patchset fixes a bug introduced by commit 51151a16 (mlx4: allow order-0 memory allocations in RX path). Where dma_unmap_page wasn't called. Changes from V0: - Added "Rename name of mlx4_en_rx_alloc members". Old names were confusing. - Last frag in page calculation was wrong. Since all frags in page are of the same size, need to add this frag_stride to end of frag offset, and not the size of next frag in skb. ==================== Signed-off-by: David S. Miller --- 3c01352db3868aab6c6e6402c2cfb781f7755504