diff options
| author |   David S. Miller <davem@davemloft.net> | 2010-12-17 12:27:22 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-17 12:27:22 -0800 |
| commit | b4aa9e05a61b845541fa6f5b1d246976922601f0 (patch) | |
| tree | ca94478c3df281ab76a3399f5ba6341ade3f5791 /drivers/net/enic | |
| parent | qlcnic: reset pci function unconditionally during probe (diff) | |
| parent | netlink: fix gcc -Wconversion compilation warning (diff) | |
| download | linux-dev-b4aa9e05a61b845541fa6f5b1d246976922601f0.tar.xz linux-dev-b4aa9e05a61b845541fa6f5b1d246976922601f0.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x.h
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-core.h
drivers/vhost/vhost.c
Diffstat (limited to 'drivers/net/enic')
| -rw-r--r-- | drivers/net/enic/enic_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c index 9710047c12a4..a0af48c51fb3 100644 --- a/drivers/net/enic/enic_main.c +++ b/drivers/net/enic/enic_main.c @@ -2098,7 +2098,8 @@ static void enic_poll_controller(struct net_device *netdev) case VNIC_DEV_INTR_MODE_MSIX: for (i = 0; i < enic->rq_count; i++) { intr = enic_msix_rq_intr(enic, i); - enic_isr_msix_rq(enic->msix_entry[intr].vector, enic); + enic_isr_msix_rq(enic->msix_entry[intr].vector, + &enic->napi[i]); } intr = enic_msix_wq_intr(enic, i); enic_isr_msix_wq(enic->msix_entry[intr].vector, enic); |