qlcnic: Initialize dcbnl_ops before register_netdev

Rajesh Borundia · davem330 · commit cd1560e2b60f · 2014-08-05T16:23:27.000-07:00
o Initialization of dcbnl_ops after register netdev may result in
  dcbnl_ops not getting set before it is being accessed from open.
  So, moving it before register_netdev.

Signed-off-by: Rajesh Borundia &lt;rajesh.borundia@qlogic.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -2323,14 +2323,14 @@ qlcnic_setup_netdev(struct qlcnic_adapter *adapter, struct net_device *netdev,
 	if (err)
 		return err;
 
+	qlcnic_dcb_init_dcbnl_ops(adapter->dcb);
+
 	err = register_netdev(netdev);
 	if (err) {
 		dev_err(&pdev->dev, "failed to register net device\n");
 		return err;
 	}
 
-	qlcnic_dcb_init_dcbnl_ops(adapter->dcb);
-
 	return 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2323,14 +2323,14 @@ qlcnic_setup_netdev(struct qlcnic_adapter adapter, struct net_device netdev,`
`2323`	`2323`	`if (err)`
`2324`	`2324`	`return err;`
`2325`	`2325`
	`2326`	`+ qlcnic_dcb_init_dcbnl_ops(adapter->dcb);`
	`2327`	`+`
`2326`	`2328`	`err = register_netdev(netdev);`
`2327`	`2329`	`if (err) {`
`2328`	`2330`	`dev_err(&pdev->dev, "failed to register net device\n");`
`2329`	`2331`	`return err;`
`2330`	`2332`	`}`
`2331`	`2333`
`2332`		`- qlcnic_dcb_init_dcbnl_ops(adapter->dcb);`
`2333`		`-`
`2334`	`2334`	`return 0;`
`2335`	`2335`	`}`
`2336`	`2336`