mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00
funeth: remove pointless check of devlink pointer in create/destroy_netdev() flows
Once devlink port is successfully registered, the devlink pointer is not NULL. Therefore, the check is going to be always true and therefore pointless. Remove it. Signed-off-by: Jiri Pirko <jiri@nvidia.com> Acked-by: Dimitris Michailidis <dmichail@fungible.com> Link: https://lore.kernel.org/r/20220826110411.1409446-1-jiri@resnulli.us Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
1390d912b9
commit
4f99de7b18
1 changed files with 4 additions and 8 deletions
|
@ -1802,16 +1802,14 @@ static int fun_create_netdev(struct fun_ethdev *ed, unsigned int portid)
|
|||
if (rc)
|
||||
goto unreg_devlink;
|
||||
|
||||
if (fp->dl_port.devlink)
|
||||
devlink_port_type_eth_set(&fp->dl_port, netdev);
|
||||
devlink_port_type_eth_set(&fp->dl_port, netdev);
|
||||
|
||||
return 0;
|
||||
|
||||
unreg_devlink:
|
||||
ed->netdevs[portid] = NULL;
|
||||
fun_ktls_cleanup(fp);
|
||||
if (fp->dl_port.devlink)
|
||||
devlink_port_unregister(&fp->dl_port);
|
||||
devlink_port_unregister(&fp->dl_port);
|
||||
free_stats:
|
||||
fun_free_stats_area(fp);
|
||||
free_rss:
|
||||
|
@ -1830,10 +1828,8 @@ static void fun_destroy_netdev(struct net_device *netdev)
|
|||
struct funeth_priv *fp;
|
||||
|
||||
fp = netdev_priv(netdev);
|
||||
if (fp->dl_port.devlink) {
|
||||
devlink_port_type_clear(&fp->dl_port);
|
||||
devlink_port_unregister(&fp->dl_port);
|
||||
}
|
||||
devlink_port_type_clear(&fp->dl_port);
|
||||
devlink_port_unregister(&fp->dl_port);
|
||||
unregister_netdev(netdev);
|
||||
fun_ktls_cleanup(fp);
|
||||
fun_free_stats_area(fp);
|
||||
|
|
Loading…
Add table
Reference in a new issue