On Fri, Apr 8, 2016 at 10:30 PM, Eric Dumazet <eric.duma...@gmail.com> wrote:
> From: Florian Fainelli <f.faine...@gmail.com>
>
> bcmgenet_isr1() and bcmgenet_isr0() run in hard irq context,
> we do not need to block irq again.
>
> Signed-off-by: Florian Fainelli <f.faine...@gmail.com>
> Signed-off-by: Eric Dumazet <eduma...@google.com>
Acked-by: Petri Gynther <pgynt...@google.com>
> ---
> drivers/net/ethernet/broadcom/genet/bcmgenet.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
> b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
> index f7b42b9fc979..4367d561a12e 100644
> --- 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);
> }
> }
>
>
>
