mlx4: use napi_schedule_irqoff()

[deliverable/linux.git] / drivers / net / ethernet / mellanox / mlx4 / en_rx.c

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index a33048ee9621a360060fed128d6f048faf53ea42..c562c1468944f9ad4319e5faaf19bf9e66d15eaf 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -76,10 +76,10 @@ static int mlx4_alloc_pages(struct mlx4_en_priv *priv,
        page_alloc->dma = dma;
        page_alloc->page_offset = frag_info->frag_align;
        /* Not doing get_page() for each frag is a big win
-        * on asymetric workloads.
+        * on asymetric workloads. Note we can not use atomic_set().
         */
-       atomic_set(&page->_count,
-                  page_alloc->page_size / frag_info->frag_stride);
+       atomic_add(page_alloc->page_size / frag_info->frag_stride - 1,
+                  &page->_count);
        return 0;
 }
 
@@ -119,7 +119,6 @@ static int mlx4_en_alloc_frags(struct mlx4_en_priv *priv,
 
 out:
        while (i--) {
-               frag_info = &priv->frag_info[i];
                if (page_alloc[i].page != ring_alloc[i].page) {
                        dma_unmap_page(priv->ddev, page_alloc[i].dma,
                                page_alloc[i].page_size, PCI_DMA_FROMDEVICE);
@@ -879,8 +878,8 @@ void mlx4_en_rx_irq(struct mlx4_cq *mcq)
        struct mlx4_en_cq *cq = container_of(mcq, struct mlx4_en_cq, mcq);
        struct mlx4_en_priv *priv = netdev_priv(cq->dev);
 
-       if (priv->port_up)
-               napi_schedule(&cq->napi);
+       if (likely(priv->port_up))
+               napi_schedule_irqoff(&cq->napi);
        else
                mlx4_en_arm_cq(priv, cq);
 }