diff options
| author | Florian Fainelli | 2016-04-20 20:37:08 +0200 |
|---|---|---|
| committer | David S. Miller | 2016-04-21 21:06:04 +0200 |
| commit | ba90950c94713f294e8778e891eef4143183957c (patch) | |
| tree | e8136c9d614d94326476d04070b831c79344821a /drivers/net/ethernet/broadcom/bcmsysport.c | |
| parent | Merge branch 'nlattr_align' (diff) | |
| download | kernel-qcow2-linux-ba90950c94713f294e8778e891eef4143183957c.tar.gz kernel-qcow2-linux-ba90950c94713f294e8778e891eef4143183957c.tar.xz kernel-qcow2-linux-ba90950c94713f294e8778e891eef4143183957c.zip | |
net: bcmsysport: use __napi_schedule_irqoff()
Both bcm_sysport_tx_isr() and bcm_sysport_rx_isr() 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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bcmsysport.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bcmsysport.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c index 993c780bdfab..9e3ec739d860 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c @@ -873,7 +873,7 @@ static irqreturn_t bcm_sysport_rx_isr(int irq, void *dev_id) if (likely(napi_schedule_prep(&priv->napi))) { /* disable RX interrupts */ intrl2_0_mask_set(priv, INTRL2_0_RDMA_MBDONE); - __napi_schedule(&priv->napi); + __napi_schedule_irqoff(&priv->napi); } } @@ -916,7 +916,7 @@ static irqreturn_t bcm_sysport_tx_isr(int irq, void *dev_id) if (likely(napi_schedule_prep(&txr->napi))) { intrl2_1_mask_set(priv, BIT(ring)); - __napi_schedule(&txr->napi); + __napi_schedule_irqoff(&txr->napi); } } |