Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

e1000: Replace e1000_free_frag with skb_free_frag

Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com>
Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Alexander Duyck and committed by
David S. Miller
6bf93ba8 13dc0d2b

+7 -12
+7 -12
drivers/net/ethernet/intel/e1000/e1000_main.c
··· 2079 2079 return data; 2080 2080 } 2081 2081 2082 - static void e1000_free_frag(const void *data) 2083 - { 2084 - put_page(virt_to_head_page(data)); 2085 - } 2086 - 2087 2082 /** 2088 2083 * e1000_clean_rx_ring - Free Rx Buffers per Queue 2089 2084 * @adapter: board private structure ··· 2102 2107 adapter->rx_buffer_len, 2103 2108 DMA_FROM_DEVICE); 2104 2109 if (buffer_info->rxbuf.data) { 2105 - e1000_free_frag(buffer_info->rxbuf.data); 2110 + skb_free_frag(buffer_info->rxbuf.data); 2106 2111 buffer_info->rxbuf.data = NULL; 2107 2112 } 2108 2113 } else if (adapter->clean_rx == e1000_clean_jumbo_rx_irq) { ··· 4589 4594 data = e1000_alloc_frag(adapter); 4590 4595 /* Failed allocation, critical failure */ 4591 4596 if (!data) { 4592 - e1000_free_frag(olddata); 4597 + skb_free_frag(olddata); 4593 4598 adapter->alloc_rx_buff_failed++; 4594 4599 break; 4595 4600 } 4596 4601 4597 4602 if (!e1000_check_64k_bound(adapter, data, bufsz)) { 4598 4603 /* give up */ 4599 - e1000_free_frag(data); 4600 - e1000_free_frag(olddata); 4604 + skb_free_frag(data); 4605 + skb_free_frag(olddata); 4601 4606 adapter->alloc_rx_buff_failed++; 4602 4607 break; 4603 4608 } 4604 4609 4605 4610 /* Use new allocation */ 4606 - e1000_free_frag(olddata); 4611 + skb_free_frag(olddata); 4607 4612 } 4608 4613 buffer_info->dma = dma_map_single(&pdev->dev, 4609 4614 data, 4610 4615 adapter->rx_buffer_len, 4611 4616 DMA_FROM_DEVICE); 4612 4617 if (dma_mapping_error(&pdev->dev, buffer_info->dma)) { 4613 - e1000_free_frag(data); 4618 + skb_free_frag(data); 4614 4619 buffer_info->dma = 0; 4615 4620 adapter->alloc_rx_buff_failed++; 4616 4621 break; ··· 4632 4637 adapter->rx_buffer_len, 4633 4638 DMA_FROM_DEVICE); 4634 4639 4635 - e1000_free_frag(data); 4640 + skb_free_frag(data); 4636 4641 buffer_info->rxbuf.data = NULL; 4637 4642 buffer_info->dma = 0; 4638 4643