From: David S. Miller Date: Sat, 1 Nov 2014 19:14:07 +0000 (-0400) Subject: Merge branch 'systemport-net' X-Git-Tag: v3.18-rc5~22^2~50 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1868855798b1a1b413bf823f21fa798f176195b7;p=karo-tx-linux.git Merge branch 'systemport-net' Florian Fainelli says: ==================== net: systemport: TX dma fixes This patch series contains two fixes for our transmit path, first one is a pretty nasty one since we were not allocating a large enough dma coherent pool for our transmit descriptors, which would work most of the time, since allocations are contiguous and we could have. Second patch fixes a less frequent, though highly likley crash when using CMA allocations. ==================== Signed-off-by: David S. Miller --- 1868855798b1a1b413bf823f21fa798f176195b7