From: Alexander Gordeev <agordeev@redhat.com>
To: Shahed Shaikh <shahed.shaikh@qlogic.com>
Cc: linux-kernel <linux-kernel@vger.kernel.org>,
Dept-HSG Linux NIC Dev <Dept-HSGLinuxNICDev@qlogic.com>,
netdev <netdev@vger.kernel.org>,
linux-pci <linux-pci@vger.kernel.org>
Subject: [PATCH v2 net-next 2/2] qlcnic: Use pci_enable_msix_exact() instead of pci_enable_msix()
Date: Fri, 25 Apr 2014 11:43:50 +0200 [thread overview]
Message-ID: <20140425094349.GA6397@dhcp-26-207.brq.redhat.com> (raw)
In-Reply-To: <262CB373A6D1F14F9B81E82F74F77D5A46F9EEA2@avmb2.qlogic.org>
As result of deprecation of MSI-X/MSI enablement functions
pci_enable_msix() and pci_enable_msi_block() all drivers
using these two interfaces need to be updated to use the
new pci_enable_msi_range() or pci_enable_msi_exact()
and pci_enable_msix_range() or pci_enable_msix_exact()
interfaces.
Cc: Shahed Shaikh <shahed.shaikh@qlogic.com>
Cc: Dept-HSGLinuxNICDev@qlogic.com
Cc: netdev@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
---
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index dbf7539..73f908a 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -690,10 +690,10 @@ int qlcnic_setup_tss_rss_intr(struct qlcnic_adapter *adapter)
adapter->msix_entries[vector].entry = vector;
restore:
- err = pci_enable_msix(pdev, adapter->msix_entries, num_msix);
- if (err > 0) {
+ err = pci_enable_msix_exact(pdev, adapter->msix_entries, num_msix);
+ if (err == -ENOSPC) {
if (!adapter->drv_tss_rings && !adapter->drv_rss_rings)
- return -ENOSPC;
+ return err;
netdev_info(adapter->netdev,
"Unable to allocate %d MSI-X vectors, Available vectors %d\n",
--
1.7.7.6
--
Regards,
Alexander Gordeev
agordeev@redhat.com
next prev parent reply other threads:[~2014-04-25 9:42 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-25 8:06 [PATCH net-next 0/2] Use pci_enable_msix_range() " Alexander Gordeev
2014-04-25 8:06 ` [PATCH net-next 1/2] i40evf: " Alexander Gordeev
2014-04-27 23:30 ` David Miller
2014-04-28 9:50 ` [E1000-devel] " Jeff Kirsher
2014-04-25 8:06 ` [PATCH net-next 2/2] qlcnic: Use pci_enable_msix_exact() " Alexander Gordeev
2014-04-25 8:48 ` Shahed Shaikh
2014-04-25 9:00 ` Alexander Gordeev
2014-04-25 9:02 ` Shahed Shaikh
2014-04-25 9:43 ` Alexander Gordeev [this message]
2014-04-25 9:43 ` [PATCH v2 " Shahed Shaikh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140425094349.GA6397@dhcp-26-207.brq.redhat.com \
--to=agordeev@redhat.com \
--cc=Dept-HSGLinuxNICDev@qlogic.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=shahed.shaikh@qlogic.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®