net: bcmgenet: use __napi_schedule_irqoff()

bcmgenet_isr1() and bcmgenet_isr0() run in hard irq context,
we do not need to block irq again.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Petri Gynther <pgynther@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index e823013d312578eb20aa3cbec91e61d4b2280528..49f132c7ed99e8aff27b6960244ae7c0b3908038 100644 (file)
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -2493,7 +2493,7 @@ static irqreturn_t bcmgenet_isr1(int irq, void *dev_id)
 
                if (likely(napi_schedule_prep(&rx_ring->napi))) {
                        rx_ring->int_disable(rx_ring);
-                       __napi_schedule(&rx_ring->napi);
+                       __napi_schedule_irqoff(&rx_ring->napi);
                }
        }
 
@@ -2506,7 +2506,7 @@ static irqreturn_t bcmgenet_isr1(int irq, void *dev_id)
 
                if (likely(napi_schedule_prep(&tx_ring->napi))) {
                        tx_ring->int_disable(tx_ring);
-                       __napi_schedule(&tx_ring->napi);
+                       __napi_schedule_irqoff(&tx_ring->napi);
                }
        }
 
@@ -2536,7 +2536,7 @@ static irqreturn_t bcmgenet_isr0(int irq, void *dev_id)
 
                if (likely(napi_schedule_prep(&rx_ring->napi))) {
                        rx_ring->int_disable(rx_ring);
-                       __napi_schedule(&rx_ring->napi);
+                       __napi_schedule_irqoff(&rx_ring->napi);
                }
        }
 
@@ -2545,7 +2545,7 @@ static irqreturn_t bcmgenet_isr0(int irq, void *dev_id)
 
                if (likely(napi_schedule_prep(&tx_ring->napi))) {
                        tx_ring->int_disable(tx_ring);
-                       __napi_schedule(&tx_ring->napi);
+                       __napi_schedule_irqoff(&tx_ring->napi);
                }
        }