diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-01-25 22:11:17 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-01-25 22:11:17 +0100 |
| commit | e1a063f43a5e0435ecf8a2b6d42e10e20e8caf61 (patch) | |
| tree | 7329fb15e57917a503c859f7266fcd034728bd54 /drivers/net/ethernet/intel/igb | |
| parent | 9eb5d0e635ebe2f227d591e531d48c6f01c0dd78 (diff) | |
| parent | 0369d6315bc2bc56da2a2b15c8074b889096a47e (diff) | |
Merge branch 'topic/intel-lpe-audio' into for-next
Diffstat (limited to 'drivers/net/ethernet/intel/igb')
| -rw-r--r-- | drivers/net/ethernet/intel/igb/igb_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index a761001308dc..1515abaa5ac9 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -3962,8 +3962,8 @@ static void igb_clean_rx_ring(struct igb_ring *rx_ring) PAGE_SIZE, DMA_FROM_DEVICE, DMA_ATTR_SKIP_CPU_SYNC); - __page_frag_drain(buffer_info->page, 0, - buffer_info->pagecnt_bias); + __page_frag_cache_drain(buffer_info->page, + buffer_info->pagecnt_bias); buffer_info->page = NULL; } @@ -6991,7 +6991,7 @@ static struct sk_buff *igb_fetch_rx_buffer(struct igb_ring *rx_ring, dma_unmap_page_attrs(rx_ring->dev, rx_buffer->dma, PAGE_SIZE, DMA_FROM_DEVICE, DMA_ATTR_SKIP_CPU_SYNC); - __page_frag_drain(page, 0, rx_buffer->pagecnt_bias); + __page_frag_cache_drain(page, rx_buffer->pagecnt_bias); } /* clear contents of rx_buffer */ |