diff options
| author | Sven Eckelmann <sven@narfation.org> | 2011-05-03 11:51:38 +0200 |
|---|---|---|
| committer | Sven Eckelmann <sven@narfation.org> | 2011-05-08 16:10:41 +0200 |
| commit | c3caf5196c47a5d1c325308d8eb7f6b020ba12df (patch) | |
| tree | 6c94a6272919cb238dea5e0d4a3c06f27e7bb3f3 /net/batman-adv/bat_sysfs.c | |
| parent | 61906ae86d8989e5bd3bc1f51b2fb8d32ffde2c5 (diff) | |
| download | blackbird-obmc-linux-c3caf5196c47a5d1c325308d8eb7f6b020ba12df.tar.gz blackbird-obmc-linux-c3caf5196c47a5d1c325308d8eb7f6b020ba12df.zip | |
batman-adv: Remove unnecessary hardif_list_lock
hardif_list_lock is unneccessary because we already ensure that no
multiple admin operations can take place through rtnl_lock.
hardif_list_lock only adds additional overhead and complexity.
Critical functions now check whether they are called with rtnl_lock
using ASSERT_RTNL.
It indirectly fixes the problem that orig_hash_del_if() expects that
only one interface is deleted from hardif_list at a time, but
hardif_remove_interfaces() removes all at once and then calls
orig_hash_del_if().
Reported-by: Linus Lüssing <linus.luessing@web.de>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Diffstat (limited to 'net/batman-adv/bat_sysfs.c')
| -rw-r--r-- | net/batman-adv/bat_sysfs.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/batman-adv/bat_sysfs.c b/net/batman-adv/bat_sysfs.c index e449bf6353e0..85ba20d98a66 100644 --- a/net/batman-adv/bat_sysfs.c +++ b/net/batman-adv/bat_sysfs.c @@ -502,7 +502,9 @@ static ssize_t store_mesh_iface(struct kobject *kobj, struct attribute *attr, rtnl_unlock(); } + rtnl_lock(); ret = hardif_enable_interface(hard_iface, buff); + rtnl_unlock(); out: hardif_free_ref(hard_iface); |
