diff options
Diffstat (limited to 'net/bridge/br.c')
-rw-r--r-- | net/bridge/br.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/bridge/br.c b/net/bridge/br.c index a1abe4936fe1..3addc05b9a16 100644 --- a/net/bridge/br.c +++ b/net/bridge/br.c | |||
@@ -121,6 +121,7 @@ static struct notifier_block br_device_notifier = { | |||
121 | .notifier_call = br_device_event | 121 | .notifier_call = br_device_event |
122 | }; | 122 | }; |
123 | 123 | ||
124 | /* called with RTNL */ | ||
124 | static int br_switchdev_event(struct notifier_block *unused, | 125 | static int br_switchdev_event(struct notifier_block *unused, |
125 | unsigned long event, void *ptr) | 126 | unsigned long event, void *ptr) |
126 | { | 127 | { |
@@ -130,7 +131,6 @@ static int br_switchdev_event(struct notifier_block *unused, | |||
130 | struct switchdev_notifier_fdb_info *fdb_info; | 131 | struct switchdev_notifier_fdb_info *fdb_info; |
131 | int err = NOTIFY_DONE; | 132 | int err = NOTIFY_DONE; |
132 | 133 | ||
133 | rtnl_lock(); | ||
134 | p = br_port_get_rtnl(dev); | 134 | p = br_port_get_rtnl(dev); |
135 | if (!p) | 135 | if (!p) |
136 | goto out; | 136 | goto out; |
@@ -155,7 +155,6 @@ static int br_switchdev_event(struct notifier_block *unused, | |||
155 | } | 155 | } |
156 | 156 | ||
157 | out: | 157 | out: |
158 | rtnl_unlock(); | ||
159 | return err; | 158 | return err; |
160 | } | 159 | } |
161 | 160 | ||