diff options
| author | David S. Miller <davem@davemloft.net> | 2021-10-25 13:59:25 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-10-25 13:59:25 +0200 |
| commit | 2d7e73f09fc2f5d968ca375f047718cf25ae2b92 (patch) | |
| tree | 6091f03456ecea6d6eda5bbf064af911df649768 /include/soc | |
| parent | Merge tag 'linux-can-next-for-5.16-20211024' of git://git.kernel.org/pub/scm/... (diff) | |
| download | linux-2d7e73f09fc2f5d968ca375f047718cf25ae2b92.tar.xz linux-2d7e73f09fc2f5d968ca375f047718cf25ae2b92.zip | |
Revert "Merge branch 'dsa-rtnl'"
This reverts commit 965e6b262f48257dbdb51b565ecfd84877a0ab5f, reversing
changes made to 4d98bb0d7ec2d0b417df6207b0bafe1868bad9f8.
Diffstat (limited to 'include/soc')
| -rw-r--r-- | include/soc/mscc/ocelot.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/soc/mscc/ocelot.h b/include/soc/mscc/ocelot.h index fef3a36b0210..9b872da0c246 100644 --- a/include/soc/mscc/ocelot.h +++ b/include/soc/mscc/ocelot.h @@ -675,9 +675,6 @@ struct ocelot { struct delayed_work stats_work; struct workqueue_struct *stats_queue; - /* Lock for serializing access to the MAC table */ - struct mutex mact_lock; - struct workqueue_struct *owq; u8 ptp:1; |