diff options
| author | Andre Detsch <adetsch@br.ibm.com> | 2010-04-26 07:27:07 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-12 15:02:53 -0700 |
| commit | 4d3dbcf9153c50f485094fdc8c3edb9affb49be8 (patch) | |
| tree | 4662a1d4a5a3df34d04c4494c9ae9cbba7b0a713 /drivers/net | |
| parent | 023db2c37409af735e9eaee9bef89a1852e814fc (diff) | |
| download | kernel-crypto-4d3dbcf9153c50f485094fdc8c3edb9affb49be8.tar.gz kernel-crypto-4d3dbcf9153c50f485094fdc8c3edb9affb49be8.tar.xz kernel-crypto-4d3dbcf9153c50f485094fdc8c3edb9affb49be8.zip | |
tg3: Fix INTx fallback when MSI fails
commit dc8bf1b1a6edfc92465526de19772061302f0929 upstream.
tg3: Fix INTx fallback when MSI fails
MSI setup changes the value of irq_vec in struct tg3 *tp.
This attribute must be taken into account and restored before
we try to do a new request_irq for INTx fallback.
In powerpc, the original code was leading to an EINVAL return within
request_irq, because the driver was trying to use the disabled MSI
virtual irq number instead of tp->pdev->irq.
Signed-off-by: Andre Detsch <adetsch@br.ibm.com>
Acked-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Cc: Brandon Philips <bphilips@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/tg3.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 17d1493bf5f..8405fb8fe13 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -8572,6 +8572,7 @@ static int tg3_test_msi(struct tg3 *tp) pci_disable_msi(tp->pdev); tp->tg3_flags2 &= ~TG3_FLG2_USING_MSI; + tp->napi[0].irq_vec = tp->pdev->irq; err = tg3_request_irq(tp, 0); if (err) |