diff options
author | David S. Miller <davem@davemloft.net> | 2021-10-25 12:59:25 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2021-10-25 12:59:25 +0100 |
commit | 2d7e73f09fc2f5d968ca375f047718cf25ae2b92 (patch) | |
tree | 6091f03456ecea6d6eda5bbf064af911df649768 /net/dsa/slave.c | |
parent | 12f241f26436cf1134f8a05551d23961ee46037e (diff) | |
download | linux-2d7e73f09fc2f5d968ca375f047718cf25ae2b92.tar.gz linux-2d7e73f09fc2f5d968ca375f047718cf25ae2b92.tar.bz2 linux-2d7e73f09fc2f5d968ca375f047718cf25ae2b92.zip |
Revert "Merge branch 'dsa-rtnl'"
This reverts commit 965e6b262f48257dbdb51b565ecfd84877a0ab5f, reversing
changes made to 4d98bb0d7ec2d0b417df6207b0bafe1868bad9f8.
Diffstat (limited to 'net/dsa/slave.c')
-rw-r--r-- | net/dsa/slave.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index adcfb2cb4e61..9d9fef668eba 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -2413,6 +2413,7 @@ static void dsa_slave_switchdev_event_work(struct work_struct *work) dp = dsa_to_port(ds, switchdev_work->port); + rtnl_lock(); switch (switchdev_work->event) { case SWITCHDEV_FDB_ADD_TO_DEVICE: if (switchdev_work->host_addr) @@ -2447,6 +2448,7 @@ static void dsa_slave_switchdev_event_work(struct work_struct *work) break; } + rtnl_unlock(); dev_put(switchdev_work->dev); kfree(switchdev_work); |