Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dac916f8 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

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: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Acked-by: default avatarPetri Gynther <pgynther@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent eb96ce01

drivers/net/ethernet/broadcom/genet/bcmgenet.c

+4 −4
Original line number Diff line number Diff line
@@ -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);

		}

	}