]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
be2net: fix reporting number of actual rx queues
authorSathya Perla <sathya.perla@emulex.com>
Tue, 5 Jun 2012 19:37:20 +0000 (19:37 +0000)
committerMaxim Uvarov <maxim.uvarov@oracle.com>
Mon, 27 Aug 2012 14:06:28 +0000 (07:06 -0700)
Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/benet/be_main.c

index 32867dfc0d3512df92650d69174fee14345a5698..0801fe57ec7de80d2682bf8001c295e9834da292 100644 (file)
@@ -1862,6 +1862,12 @@ static int be_rx_cqs_create(struct be_adapter *adapter)
         */
        adapter->num_rx_qs = (num_irqs(adapter) > 1) ?
                                num_irqs(adapter) + 1 : 1;
+       if (adapter->num_rx_qs != MAX_RX_QS) {
+               rtnl_lock();
+               netif_set_real_num_rx_queues(adapter->netdev,
+                                            adapter->num_rx_qs);
+               rtnl_unlock();
+       }
 
        adapter->big_page_size = (1 << get_order(rx_frag_size)) * PAGE_SIZE;
        for_all_rx_queues(adapter, rxo, i) {
@@ -3688,7 +3694,7 @@ static int __devinit be_probe(struct pci_dev *pdev,
                goto disable_dev;
        pci_set_master(pdev);
 
-       netdev = alloc_etherdev_mq(sizeof(struct be_adapter), MAX_TX_QS);
+       netdev = alloc_etherdev_mqs(sizeof(*adapter), MAX_TX_QS, MAX_RX_QS);
        if (netdev == NULL) {
                status = -ENOMEM;
                goto rel_reg;