3 files changed, 14 insertions, 10 deletions

diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
index 32f6d2e24d66..1a1a6380c128 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
@@ -95,6 +95,7 @@ void aq_nic_cfg_start(struct aq_nic_s *self)
         /*rss rings */
         cfg->vecs = min(cfg->aq_hw_caps->vecs, AQ_CFG_VECS_DEF);
         cfg->vecs = min(cfg->vecs, num_online_cpus());
+        cfg->vecs = min(cfg->vecs, self->irqvecs);
         /* cfg->vecs should be power of 2 for RSS */
         if (cfg->vecs >= 8U)
                 cfg->vecs = 8U;
@@ -246,6 +247,8 @@ void aq_nic_ndev_init(struct aq_nic_s *self)
 
         self->ndev->hw_features |= aq_hw_caps->hw_features;
         self->ndev->features = aq_hw_caps->hw_features;
+        self->ndev->vlan_features |= NETIF_F_HW_CSUM | NETIF_F_RXCSUM |
+                                     NETIF_F_RXHASH | NETIF_F_SG | NETIF_F_LRO;
         self->ndev->priv_flags = aq_hw_caps->hw_priv_flags;
         self->ndev->priv_flags |= IFF_LIVE_ADDR_CHANGE;
 
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.h b/drivers/net/ethernet/aquantia/atlantic/aq_nic.h
index 219b550d1665..faa533a0ec47 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.h
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.h
@@ -80,6 +80,7 @@ struct aq_nic_s {
 
         struct pci_dev *pdev;
         unsigned int msix_entry_mask;
+        u32 irqvecs;
 };
 
 static inline struct device *aq_nic_get_dev(struct aq_nic_s *self)
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c
index ecc6306f940f..a50e08bb4748 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c
@@ -267,16 +267,16 @@ static int aq_pci_probe(struct pci_dev *pdev,
         numvecs = min(numvecs, num_online_cpus());
         /*enable interrupts */
 #if !AQ_CFG_FORCE_LEGACY_INT
-        err = pci_alloc_irq_vectors(self->pdev, numvecs, numvecs,
-                                    PCI_IRQ_MSIX);
-
-        if (err < 0) {
-                err = pci_alloc_irq_vectors(self->pdev, 1, 1,
-                                            PCI_IRQ_MSI | PCI_IRQ_LEGACY);
-                if (err < 0)
-                        goto err_hwinit;
+        numvecs = pci_alloc_irq_vectors(self->pdev, 1, numvecs,
+                                        PCI_IRQ_MSIX | PCI_IRQ_MSI |
+                                        PCI_IRQ_LEGACY);
+
+        if (numvecs < 0) {
+                err = numvecs;
+                goto err_hwinit;
         }
 #endif
+        self->irqvecs = numvecs;
 
         /* net device init */
         aq_nic_cfg_start(self);
@@ -298,9 +298,9 @@ err_free_aq_hw:
         kfree(self->aq_hw);
 err_ioremap:
         free_netdev(ndev);
-err_pci_func:
-        pci_release_regions(pdev);
 err_ndev:
+        pci_release_regions(pdev);
+err_pci_func:
         pci_disable_device(pdev);
         return err;
 }