diff options
Diffstat (limited to 'drivers/net/xen-netback/netback.c')
-rw-r--r-- | drivers/net/xen-netback/netback.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c index 682633bfe00f..05593d882023 100644 --- a/drivers/net/xen-netback/netback.c +++ b/drivers/net/xen-netback/netback.c | |||
@@ -635,9 +635,7 @@ static void xen_netbk_rx_action(struct xen_netbk *netbk) | |||
635 | return; | 635 | return; |
636 | 636 | ||
637 | BUG_ON(npo.copy_prod > ARRAY_SIZE(netbk->grant_copy_op)); | 637 | BUG_ON(npo.copy_prod > ARRAY_SIZE(netbk->grant_copy_op)); |
638 | ret = HYPERVISOR_grant_table_op(GNTTABOP_copy, &netbk->grant_copy_op, | 638 | gnttab_batch_copy(netbk->grant_copy_op, npo.copy_prod); |
639 | npo.copy_prod); | ||
640 | BUG_ON(ret != 0); | ||
641 | 639 | ||
642 | while ((skb = __skb_dequeue(&rxq)) != NULL) { | 640 | while ((skb = __skb_dequeue(&rxq)) != NULL) { |
643 | sco = (struct skb_cb_overlay *)skb->cb; | 641 | sco = (struct skb_cb_overlay *)skb->cb; |
@@ -1460,18 +1458,15 @@ static void xen_netbk_tx_submit(struct xen_netbk *netbk) | |||
1460 | static void xen_netbk_tx_action(struct xen_netbk *netbk) | 1458 | static void xen_netbk_tx_action(struct xen_netbk *netbk) |
1461 | { | 1459 | { |
1462 | unsigned nr_gops; | 1460 | unsigned nr_gops; |
1463 | int ret; | ||
1464 | 1461 | ||
1465 | nr_gops = xen_netbk_tx_build_gops(netbk); | 1462 | nr_gops = xen_netbk_tx_build_gops(netbk); |
1466 | 1463 | ||
1467 | if (nr_gops == 0) | 1464 | if (nr_gops == 0) |
1468 | return; | 1465 | return; |
1469 | ret = HYPERVISOR_grant_table_op(GNTTABOP_copy, | ||
1470 | netbk->tx_copy_ops, nr_gops); | ||
1471 | BUG_ON(ret); | ||
1472 | 1466 | ||
1473 | xen_netbk_tx_submit(netbk); | 1467 | gnttab_batch_copy(netbk->tx_copy_ops, nr_gops); |
1474 | 1468 | ||
1469 | xen_netbk_tx_submit(netbk); | ||
1475 | } | 1470 | } |
1476 | 1471 | ||
1477 | static void xen_netbk_idx_release(struct xen_netbk *netbk, u16 pending_idx) | 1472 | static void xen_netbk_idx_release(struct xen_netbk *netbk, u16 pending_idx) |