diff options
| author | Ayaz Abdulla <aabdulla@nvidia.com> | 2009-01-11 00:09:04 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-11 00:11:28 -0800 |
| commit | eb10a781824ca63c4e484c4642a19b3370980792 (patch) | |
| tree | cfd46aea9788547edeb5537eeeec9f2b153f32f8 /drivers/net/forcedeth.c | |
| parent | 1b6725dea766b7437d885661140b6e0340d47613 (diff) | |
| download | blackbird-op-linux-eb10a781824ca63c4e484c4642a19b3370980792.tar.gz blackbird-op-linux-eb10a781824ca63c4e484c4642a19b3370980792.zip | |
forcedeth: napi schedule lock fix
This patch fixes a potential race condition between scheduling napi and
completing napi poll. The call to netif_rx_schedule should be under
protection of the lock (as is the completion), otherwise, interrupts
could be masked off.
Signed-off-by: Ayaz Abdulla <aabdulla@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/forcedeth.c')
| -rw-r--r-- | drivers/net/forcedeth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index e06782a60bd5..5b910cf63740 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c @@ -3405,10 +3405,10 @@ static irqreturn_t nv_nic_irq(int foo, void *data) #ifdef CONFIG_FORCEDETH_NAPI if (events & NVREG_IRQ_RX_ALL) { + spin_lock(&np->lock); netif_rx_schedule(&np->napi); /* Disable furthur receive irq's */ - spin_lock(&np->lock); np->irqmask &= ~NVREG_IRQ_RX_ALL; if (np->msi_flags & NV_MSI_X_ENABLED) @@ -3522,10 +3522,10 @@ static irqreturn_t nv_nic_irq_optimized(int foo, void *data) #ifdef CONFIG_FORCEDETH_NAPI if (events & NVREG_IRQ_RX_ALL) { + spin_lock(&np->lock); netif_rx_schedule(&np->napi); /* Disable furthur receive irq's */ - spin_lock(&np->lock); np->irqmask &= ~NVREG_IRQ_RX_ALL; if (np->msi_flags & NV_MSI_X_ENABLED) |
