]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Revert "net: devlink: add RNLT lock assertion to devlink_compat_switch_id_get()"
authorVlad Buslov <vladbu@nvidia.com>
Mon, 29 Aug 2022 12:13:24 +0000 (14:13 +0200)
committerJakub Kicinski <kuba@kernel.org>
Wed, 31 Aug 2022 06:21:17 +0000 (23:21 -0700)
This reverts commit 6005a8aecee8afeba826295321a612ab485c230e.

The assertion was intentionally removed in commit 043b8413e8c0 ("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>
net/core/devlink.c

index 97a81b0a8ab4c036a9ed9371001c919655e590c8..7776dc82f88d6d7202d5028152eef77a3e1170cf 100644 (file)
@@ -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;