From: David S. Miller Date: Mon, 24 Apr 2017 18:35:45 +0000 (-0400) Subject: Merge branch 'nfp-dma-adjust_head-fixes' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=09d36071cfbc1fec9c93a30704b687829ee5efef;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'nfp-dma-adjust_head-fixes' Jakub Kicinski says: ==================== nfp: DMA flags, adjust head and fixes This series takes advantage of Alex's DMA_ATTR_SKIP_CPU_SYNC to make XDP packet modifications "correct" from DMA API point of view. It also allows us to parse the metadata before we run XDP at no additional DMA sync cost. That way we can get rid of the metadata memcpy, and remove the last upstream user of bpf_prog->xdp_adjust_head. David's patch adds a way to read capabilities from the management firmware. There are also two net-next fixes. Patch 4 which fixes what seems to be a result of a botched rebase on my part. Patch 5 corrects locking when state of ethernet ports is being refreshed. v3: move the sync from alloc func to the actual give to hw func v2: sync rx buffers before giving them to the card (Alex) ==================== Signed-off-by: David S. Miller --- 09d36071cfbc1fec9c93a30704b687829ee5efef