aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRajesh Borundia <rajesh.borundia@qlogic.com>2014-08-04 11:51:18 -0400
committerDavid S. Miller <davem@davemloft.net>2014-08-05 19:23:27 -0400
commitcd1560e2b60fc2fbfadb9200c366eb59fe04f10d (patch)
treeb98ac38ecf9bfd73f1af2d8901daf8e23f931342
parentbf63014f108aaff49e4382b7adc7d0a2b6365744 (diff)
qlcnic: Initialize dcbnl_ops before register_netdev
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 <rajesh.borundia@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 158e1d9f255f..3187bc0c471b 100644
--- 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,
2323 if (err) 2323 if (err)
2324 return err; 2324 return err;
2325 2325
2326 qlcnic_dcb_init_dcbnl_ops(adapter->dcb);
2327
2326 err = register_netdev(netdev); 2328 err = register_netdev(netdev);
2327 if (err) { 2329 if (err) {
2328 dev_err(&pdev->dev, "failed to register net device\n"); 2330 dev_err(&pdev->dev, "failed to register net device\n");
2329 return err; 2331 return err;
2330 } 2332 }
2331 2333
2332 qlcnic_dcb_init_dcbnl_ops(adapter->dcb);
2333
2334 return 0; 2334 return 0;
2335} 2335}
2336 2336