diff options
| author | David S. Miller <davem@davemloft.net> | 2013-10-08 16:10:10 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-10-08 16:10:10 -0400 |
| commit | 3c01352db3868aab6c6e6402c2cfb781f7755504 (patch) | |
| tree | ac5bd06eed05aec7bba4c49ba55aaaf32a8e39e9 /net | |
| parent | 2c6221e4a5aab417cb18bef6f1130d1374240258 (diff) | |
| parent | 021f1107ffdae7a82af6c53f4c52654062e365c6 (diff) | |
| download | linux-3c01352db3868aab6c6e6402c2cfb781f7755504.tar.gz linux-3c01352db3868aab6c6e6402c2cfb781f7755504.tar.bz2 linux-3c01352db3868aab6c6e6402c2cfb781f7755504.zip | |
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 <davem@davemloft.net>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions