sfc: Correct efx_rx_buffer::page_offset when EFX_PAGE_IP_ALIGN != 0
authorBen Hutchings <bhutchings@solarflare.com>
Tue, 5 Mar 2013 17:49:39 +0000 (17:49 +0000)
committerBen Hutchings <bhutchings@solarflare.com>
Wed, 6 Mar 2013 17:57:25 +0000 (17:57 +0000)
RX DMA buffers start at an offset of EFX_PAGE_IP_ALIGN bytes from the
start of a cache line.  This offset obviously needs to be included in
the virtual address, but this was missed in commit b590ace09d51
('sfc: Fix efx_rx_buf_offset() in the presence of swiotlb') since
EFX_PAGE_IP_ALIGN is equal to 0 on both x86 and powerpc.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
drivers/net/ethernet/sfc/rx.c

index 879ff5849bbd181e58e9d5be8e75f28d89f2ddad..bb579a6128c8ce883ac7156ea24ac541d4901e38 100644 (file)
@@ -215,7 +215,7 @@ static int efx_init_rx_buffers_page(struct efx_rx_queue *rx_queue)
                rx_buf = efx_rx_buffer(rx_queue, index);
                rx_buf->dma_addr = dma_addr + EFX_PAGE_IP_ALIGN;
                rx_buf->u.page = page;
-               rx_buf->page_offset = page_offset;
+               rx_buf->page_offset = page_offset + EFX_PAGE_IP_ALIGN;
                rx_buf->len = efx->rx_buffer_len - EFX_PAGE_IP_ALIGN;
                rx_buf->flags = EFX_RX_BUF_PAGE;
                ++rx_queue->added_count;