diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-27 15:49:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-27 15:49:13 -0400 |
| commit | e1703b36c358dde24ececba4fd609ecd91433ba3 (patch) | |
| tree | d59c333d0ad5bf72f165264eba6048c87fdc4e0f /drivers/net/tg3.c | |
| parent | 7ec75c582e639d956ce3afd499f67febe6f902a4 (diff) | |
| parent | e95ef5d3f6bc60433883e1ef65dac747acd0bf1a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e100.c
drivers/net/e1000e/netdev.c
Diffstat (limited to 'drivers/net/tg3.c')
| -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 7724d7e4ebd6..573054ae7b58 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
| @@ -8700,6 +8700,7 @@ static int tg3_test_msi(struct tg3 *tp) | |||
| 8700 | pci_disable_msi(tp->pdev); | 8700 | pci_disable_msi(tp->pdev); |
| 8701 | 8701 | ||
| 8702 | tp->tg3_flags2 &= ~TG3_FLG2_USING_MSI; | 8702 | tp->tg3_flags2 &= ~TG3_FLG2_USING_MSI; |
| 8703 | tp->napi[0].irq_vec = tp->pdev->irq; | ||
| 8703 | 8704 | ||
| 8704 | err = tg3_request_irq(tp, 0); | 8705 | err = tg3_request_irq(tp, 0); |
| 8705 | if (err) | 8706 | if (err) |