|
@@ -1277,9 +1277,9 @@ static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
|
|
|
*/
|
|
|
dma_sync_single_for_cpu(&pdev->dev, ps_page->dma,
|
|
|
PAGE_SIZE, DMA_FROM_DEVICE);
|
|
|
- vaddr = kmap_atomic(ps_page->page, KM_SKB_DATA_SOFTIRQ);
|
|
|
+ vaddr = kmap_atomic(ps_page->page);
|
|
|
memcpy(skb_tail_pointer(skb), vaddr, l1);
|
|
|
- kunmap_atomic(vaddr, KM_SKB_DATA_SOFTIRQ);
|
|
|
+ kunmap_atomic(vaddr);
|
|
|
dma_sync_single_for_device(&pdev->dev, ps_page->dma,
|
|
|
PAGE_SIZE, DMA_FROM_DEVICE);
|
|
|
|
|
@@ -1470,12 +1470,10 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter,
|
|
|
if (length <= copybreak &&
|
|
|
skb_tailroom(skb) >= length) {
|
|
|
u8 *vaddr;
|
|
|
- vaddr = kmap_atomic(buffer_info->page,
|
|
|
- KM_SKB_DATA_SOFTIRQ);
|
|
|
+ vaddr = kmap_atomic(buffer_info->page);
|
|
|
memcpy(skb_tail_pointer(skb), vaddr,
|
|
|
length);
|
|
|
- kunmap_atomic(vaddr,
|
|
|
- KM_SKB_DATA_SOFTIRQ);
|
|
|
+ kunmap_atomic(vaddr);
|
|
|
/* re-use the page, so don't erase
|
|
|
* buffer_info->page */
|
|
|
skb_put(skb, length);
|