aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/s2io.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/s2io.c')
-rw-r--r--drivers/net/s2io.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 1b489df80fa6..512861923c6b 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -2852,7 +2852,7 @@ static int s2io_poll_msix(struct napi_struct *napi, int budget)
2852 s2io_chk_rx_buffers(nic, ring); 2852 s2io_chk_rx_buffers(nic, ring);
2853 2853
2854 if (pkts_processed < budget_org) { 2854 if (pkts_processed < budget_org) {
2855 netif_rx_complete(dev, napi); 2855 netif_rx_complete(napi);
2856 /*Re Enable MSI-Rx Vector*/ 2856 /*Re Enable MSI-Rx Vector*/
2857 addr = (u8 __iomem *)&bar0->xmsi_mask_reg; 2857 addr = (u8 __iomem *)&bar0->xmsi_mask_reg;
2858 addr += 7 - ring->ring_no; 2858 addr += 7 - ring->ring_no;
@@ -2890,7 +2890,7 @@ static int s2io_poll_inta(struct napi_struct *napi, int budget)
2890 break; 2890 break;
2891 } 2891 }
2892 if (pkts_processed < budget_org) { 2892 if (pkts_processed < budget_org) {
2893 netif_rx_complete(dev, napi); 2893 netif_rx_complete(napi);
2894 /* Re enable the Rx interrupts for the ring */ 2894 /* Re enable the Rx interrupts for the ring */
2895 writeq(0, &bar0->rx_traffic_mask); 2895 writeq(0, &bar0->rx_traffic_mask);
2896 readl(&bar0->rx_traffic_mask); 2896 readl(&bar0->rx_traffic_mask);
@@ -4344,7 +4344,7 @@ static irqreturn_t s2io_msix_ring_handle(int irq, void *dev_id)
4344 val8 = (ring->ring_no == 0) ? 0x7f : 0xff; 4344 val8 = (ring->ring_no == 0) ? 0x7f : 0xff;
4345 writeb(val8, addr); 4345 writeb(val8, addr);
4346 val8 = readb(addr); 4346 val8 = readb(addr);
4347 netif_rx_schedule(dev, &ring->napi); 4347 netif_rx_schedule(&ring->napi);
4348 } else { 4348 } else {
4349 rx_intr_handler(ring, 0); 4349 rx_intr_handler(ring, 0);
4350 s2io_chk_rx_buffers(sp, ring); 4350 s2io_chk_rx_buffers(sp, ring);
@@ -4791,7 +4791,7 @@ static irqreturn_t s2io_isr(int irq, void *dev_id)
4791 4791
4792 if (config->napi) { 4792 if (config->napi) {
4793 if (reason & GEN_INTR_RXTRAFFIC) { 4793 if (reason & GEN_INTR_RXTRAFFIC) {
4794 netif_rx_schedule(dev, &sp->napi); 4794 netif_rx_schedule(&sp->napi);
4795 writeq(S2IO_MINUS_ONE, &bar0->rx_traffic_mask); 4795 writeq(S2IO_MINUS_ONE, &bar0->rx_traffic_mask);
4796 writeq(S2IO_MINUS_ONE, &bar0->rx_traffic_int); 4796 writeq(S2IO_MINUS_ONE, &bar0->rx_traffic_int);
4797 readl(&bar0->rx_traffic_int); 4797 readl(&bar0->rx_traffic_int);