diff options
author | Cong Wang <amwang@redhat.com> | 2011-11-25 10:14:23 -0500 |
---|---|---|
committer | Cong Wang <xiyou.wangcong@gmail.com> | 2012-03-20 09:48:19 -0400 |
commit | 4679026d783eb5ac90247bc466d66b817b213abf (patch) | |
tree | 214b17ed79aaa5f20acb5b2a56a94cb2bc740b98 /drivers/net/ethernet/intel/e1000e/netdev.c | |
parent | eb3f06209412266f25c735db0b7699babf5fef9e (diff) |
net: remove the second argument of k[un]map_atomic()
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/netdev.c')
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/netdev.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 3911401ed65d..7a1ea1d6f580 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c | |||
@@ -1277,9 +1277,9 @@ static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter, | |||
1277 | */ | 1277 | */ |
1278 | dma_sync_single_for_cpu(&pdev->dev, ps_page->dma, | 1278 | dma_sync_single_for_cpu(&pdev->dev, ps_page->dma, |
1279 | PAGE_SIZE, DMA_FROM_DEVICE); | 1279 | PAGE_SIZE, DMA_FROM_DEVICE); |
1280 | vaddr = kmap_atomic(ps_page->page, KM_SKB_DATA_SOFTIRQ); | 1280 | vaddr = kmap_atomic(ps_page->page); |
1281 | memcpy(skb_tail_pointer(skb), vaddr, l1); | 1281 | memcpy(skb_tail_pointer(skb), vaddr, l1); |
1282 | kunmap_atomic(vaddr, KM_SKB_DATA_SOFTIRQ); | 1282 | kunmap_atomic(vaddr); |
1283 | dma_sync_single_for_device(&pdev->dev, ps_page->dma, | 1283 | dma_sync_single_for_device(&pdev->dev, ps_page->dma, |
1284 | PAGE_SIZE, DMA_FROM_DEVICE); | 1284 | PAGE_SIZE, DMA_FROM_DEVICE); |
1285 | 1285 | ||
@@ -1470,12 +1470,10 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter, | |||
1470 | if (length <= copybreak && | 1470 | if (length <= copybreak && |
1471 | skb_tailroom(skb) >= length) { | 1471 | skb_tailroom(skb) >= length) { |
1472 | u8 *vaddr; | 1472 | u8 *vaddr; |
1473 | vaddr = kmap_atomic(buffer_info->page, | 1473 | vaddr = kmap_atomic(buffer_info->page); |
1474 | KM_SKB_DATA_SOFTIRQ); | ||
1475 | memcpy(skb_tail_pointer(skb), vaddr, | 1474 | memcpy(skb_tail_pointer(skb), vaddr, |
1476 | length); | 1475 | length); |
1477 | kunmap_atomic(vaddr, | 1476 | kunmap_atomic(vaddr); |
1478 | KM_SKB_DATA_SOFTIRQ); | ||
1479 | /* re-use the page, so don't erase | 1477 | /* re-use the page, so don't erase |
1480 | * buffer_info->page */ | 1478 | * buffer_info->page */ |
1481 | skb_put(skb, length); | 1479 | skb_put(skb, length); |