aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/xen-netback/netback.c
diff options
context:
space:
mode:
authorZoltan Kiss <zoltan.kiss@citrix.com>2014-03-24 19:59:50 -0400
committerDavid S. Miller <davem@davemloft.net>2014-03-26 16:33:42 -0400
commit0e59a4a553df312b5308c75085f7f02b12680d12 (patch)
tree90fb5cc34b7f9185b50af68ef22f2dd4c1563e6d /drivers/net/xen-netback/netback.c
parent869b9b19b3affd81cee853d33c0b124797f3c387 (diff)
xen-netback: Non-functional follow-up patch for grant mapping series
Ian made some late comments about the grant mapping series, I incorporated the non-functional outcomes into this patch: - typo fixes in a comment of xenvif_free(), and add another one there as well - typo fix for comment of rx_drain_timeout_msecs - remove stale comment before calling xenvif_grant_handle_reset() Signed-off-by: Zoltan Kiss <zoltan.kiss@citrix.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/xen-netback/netback.c')
-rw-r--r--drivers/net/xen-netback/netback.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index 5d2dd1d54173..d3172fe0306f 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -56,7 +56,7 @@ bool separate_tx_rx_irq = 1;
56module_param(separate_tx_rx_irq, bool, 0644); 56module_param(separate_tx_rx_irq, bool, 0644);
57 57
58/* When guest ring is filled up, qdisc queues the packets for us, but we have 58/* When guest ring is filled up, qdisc queues the packets for us, but we have
59 * to timeout them, otherwise other guests' packets can get stucked there 59 * to timeout them, otherwise other guests' packets can get stuck there
60 */ 60 */
61unsigned int rx_drain_timeout_msecs = 10000; 61unsigned int rx_drain_timeout_msecs = 10000;
62module_param(rx_drain_timeout_msecs, uint, 0444); 62module_param(rx_drain_timeout_msecs, uint, 0444);
@@ -1545,7 +1545,6 @@ static inline void xenvif_tx_dealloc_action(struct xenvif *vif)
1545 idx_to_kaddr(vif, pending_idx), 1545 idx_to_kaddr(vif, pending_idx),
1546 GNTMAP_host_map, 1546 GNTMAP_host_map,
1547 vif->grant_tx_handle[pending_idx]); 1547 vif->grant_tx_handle[pending_idx]);
1548 /* Btw. already unmapped? */
1549 xenvif_grant_handle_reset(vif, pending_idx); 1548 xenvif_grant_handle_reset(vif, pending_idx);
1550 ++gop; 1549 ++gop;
1551 } 1550 }
@@ -1678,7 +1677,6 @@ void xenvif_idx_unmap(struct xenvif *vif, u16 pending_idx)
1678 idx_to_kaddr(vif, pending_idx), 1677 idx_to_kaddr(vif, pending_idx),
1679 GNTMAP_host_map, 1678 GNTMAP_host_map,
1680 vif->grant_tx_handle[pending_idx]); 1679 vif->grant_tx_handle[pending_idx]);
1681 /* Btw. already unmapped? */
1682 xenvif_grant_handle_reset(vif, pending_idx); 1680 xenvif_grant_handle_reset(vif, pending_idx);
1683 1681
1684 ret = gnttab_unmap_refs(&tx_unmap_op, NULL, 1682 ret = gnttab_unmap_refs(&tx_unmap_op, NULL,