Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b340007f authored by Vladislav Zolotarov's avatar Vladislav Zolotarov Committed by David S. Miller
Browse files

bnx2x: Do interrupt mode initialization and NAPIs adding before register_netdev() 



Move the interrupt mode configuration and NAPIs adding before a
register_netdev() call to prevent netdev->open() from running
before these functions are done.

Advance a driver version number.

Signed-off-by: default avatarVladislav Zolotarov <vladz@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Reported-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e1210d12

drivers/net/bnx2x/bnx2x.h

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
 * (you will need to reboot afterwards) */

/* #define BNX2X_STOP_ON_ERROR */



#define DRV_MODULE_VERSION      "1.60.00-4"

#define DRV_MODULE_RELDATE      "2010/11/01"

#define DRV_MODULE_VERSION      "1.60.00-5"

#define DRV_MODULE_RELDATE      "2010/11/24"

#define BNX2X_BC_VER            0x040200



#define BNX2X_MULTI_QUEUE

drivers/net/bnx2x/bnx2x_main.c

+6 −6
Original line number Diff line number Diff line
@@ -9096,12 +9096,6 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev, 
	/* calc qm_cid_count */

	bp->qm_cid_count = bnx2x_set_qm_cid_count(bp, cid_count);



	rc = register_netdev(dev);

	if (rc) {

		dev_err(&pdev->dev, "Cannot register net device\n");

		goto init_one_exit;

	}



	/* Configure interupt mode: try to enable MSI-X/MSI if

	 * needed, set bp->num_queues appropriately.

	 */
@@ -9110,6 +9104,12 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev, 
	/* Add all NAPI objects */

	bnx2x_add_all_napi(bp);



	rc = register_netdev(dev);

	if (rc) {

		dev_err(&pdev->dev, "Cannot register net device\n");

		goto init_one_exit;

	}



	bnx2x_get_pcie_width_speed(bp, &pcie_width, &pcie_speed);



	netdev_info(dev, "%s (%c%d) PCI-E x%d %s found at mem %lx,"