bnxt: set devlink port type after registration

jpirko · davem330 · commit d0d54e8c3593 · 2019-03-24T14:55:31.000-04:00
Move the type set of devlink port after it is registered.

Signed-off-by: Jiri Pirko &lt;jiri@mellanox.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
@@ -229,14 +229,14 @@ int bnxt_dl_register(struct bnxt *bp)
 		goto err_dl_unreg;
 	}
 
-	devlink_port_type_eth_set(&bp->dl_port, bp->dev);
 	devlink_port_attrs_set(&bp->dl_port, DEVLINK_PORT_FLAVOUR_PHYSICAL,
 			       bp->pf.port_id, false, 0);
 	rc = devlink_port_register(dl, &bp->dl_port, bp->pf.port_id);
 	if (rc) {
 		netdev_err(bp->dev, "devlink_port_register failed");
 		goto err_dl_param_unreg;
 	}
+	devlink_port_type_eth_set(&bp->dl_port, bp->dev);
 
 	rc = devlink_port_params_register(&bp->dl_port, bnxt_dl_port_params,
 					  ARRAY_SIZE(bnxt_dl_port_params));

Original file line number	Diff line number	Diff line change
`@@ -229,14 +229,14 @@ int bnxt_dl_register(struct bnxt *bp)`
`229`	`229`	`goto err_dl_unreg;`
`230`	`230`	`}`
`231`	`231`
`232`		`- devlink_port_type_eth_set(&bp->dl_port, bp->dev);`
`233`	`232`	`devlink_port_attrs_set(&bp->dl_port, DEVLINK_PORT_FLAVOUR_PHYSICAL,`
`234`	`233`	`bp->pf.port_id, false, 0);`
`235`	`234`	`rc = devlink_port_register(dl, &bp->dl_port, bp->pf.port_id);`
`236`	`235`	`if (rc) {`
`237`	`236`	`netdev_err(bp->dev, "devlink_port_register failed");`
`238`	`237`	`goto err_dl_param_unreg;`
`239`	`238`	`}`
	`239`	`+ devlink_port_type_eth_set(&bp->dl_port, bp->dev);`
`240`	`240`
`241`	`241`	`rc = devlink_port_params_register(&bp->dl_port, bnxt_dl_port_params,`
`242`	`242`	`ARRAY_SIZE(bnxt_dl_port_params));`