|
@@ -280,9 +280,7 @@ static void name_msix_vecs(struct adapter *adapter)
|
|
|
const struct port_info *pi = netdev_priv(dev);
|
|
|
int qs, msi;
|
|
|
|
|
|
- for (qs = 0, msi = MSIX_NIQFLINT;
|
|
|
- qs < pi->nqsets;
|
|
|
- qs++, msi++) {
|
|
|
+ for (qs = 0, msi = MSIX_IQFLINT; qs < pi->nqsets; qs++, msi++) {
|
|
|
snprintf(adapter->msix_info[msi].desc, namelen,
|
|
|
"%s-%d", dev->name, qs);
|
|
|
adapter->msix_info[msi].desc[namelen] = 0;
|
|
@@ -309,7 +307,7 @@ static int request_msix_queue_irqs(struct adapter *adapter)
|
|
|
/*
|
|
|
* Ethernet queues.
|
|
|
*/
|
|
|
- msi = MSIX_NIQFLINT;
|
|
|
+ msi = MSIX_IQFLINT;
|
|
|
for_each_ethrxq(s, rxq) {
|
|
|
err = request_irq(adapter->msix_info[msi].vec,
|
|
|
t4vf_sge_intr_msix, 0,
|
|
@@ -337,7 +335,7 @@ static void free_msix_queue_irqs(struct adapter *adapter)
|
|
|
int rxq, msi;
|
|
|
|
|
|
free_irq(adapter->msix_info[MSIX_FW].vec, &s->fw_evtq);
|
|
|
- msi = MSIX_NIQFLINT;
|
|
|
+ msi = MSIX_IQFLINT;
|
|
|
for_each_ethrxq(s, rxq)
|
|
|
free_irq(adapter->msix_info[msi++].vec,
|
|
|
&s->ethrxq[rxq].rspq);
|
|
@@ -527,7 +525,7 @@ static int setup_sge_queues(struct adapter *adapter)
|
|
|
* brought up at which point lots of things get nailed down
|
|
|
* permanently ...
|
|
|
*/
|
|
|
- msix = MSIX_NIQFLINT;
|
|
|
+ msix = MSIX_IQFLINT;
|
|
|
for_each_port(adapter, pidx) {
|
|
|
struct net_device *dev = adapter->port[pidx];
|
|
|
struct port_info *pi = netdev_priv(dev);
|
|
@@ -2470,7 +2468,6 @@ static int __devinit cxgb4vf_pci_probe(struct pci_dev *pdev,
|
|
|
version_printed = 1;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
/*
|
|
|
* Initialize generic PCI device state.
|
|
|
*/
|