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>
This commit is contained in:
Родитель
eb3f062094
Коммит
4679026d78
|
@ -3878,11 +3878,9 @@ 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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -104,8 +104,8 @@
|
|||
#include <asm/byteorder.h>
|
||||
#include <asm/uaccess.h>
|
||||
|
||||
#define cas_page_map(x) kmap_atomic((x), KM_SKB_DATA_SOFTIRQ)
|
||||
#define cas_page_unmap(x) kunmap_atomic((x), KM_SKB_DATA_SOFTIRQ)
|
||||
#define cas_page_map(x) kmap_atomic((x))
|
||||
#define cas_page_unmap(x) kunmap_atomic((x))
|
||||
#define CAS_NCPUS num_online_cpus()
|
||||
|
||||
#define cas_skb_release(x) netif_rx(x)
|
||||
|
|
Загрузка…
Ссылка в новой задаче