Skip to content

Commit

Permalink
Revert "net: devlink: add RNLT lock assertion to devlink_compat_switc…
Browse files Browse the repository at this point in the history
…h_id_get()"

This reverts commit 6005a8a.

The assertion was intentionally removed in commit 043b841 ("net:
devlink: remove redundant rtnl lock assert") and, contrary what is
described in the commit message, the comment reflects that: "Caller must
hold RTNL mutex or reference to dev...".

Signed-off-by: Vlad Buslov <vladbu@nvidia.com>
Tested-by: Leon Romanovsky <leonro@nvidia.com>
Link: https://lore.kernel.org/r/20220829121324.3980376-1-vladbu@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Vlad Buslov authored and Jakub Kicinski committed Aug 31, 2022
1 parent d5ccda9 commit 21cb860
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions net/core/devlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -12437,8 +12437,6 @@ int devlink_compat_switch_id_get(struct net_device *dev,
* devlink_port instance cannot disappear in the middle. No need to take
* any devlink lock as only permanent values are accessed.
*/
ASSERT_RTNL();

devlink_port = netdev_to_devlink_port(dev);
if (!devlink_port || !devlink_port->switch_port)
return -EOPNOTSUPP;
Expand Down

0 comments on commit 21cb860

Please sign in to comment.