diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-08 15:39:11 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-08 15:39:11 -0700 |
| commit | 02e73c1edc3746e308d1768a27fdc8121f641ab1 (patch) | |
| tree | a3db8009e4549e3d85905e11ac2bf8e64df1763f /net/batman-adv/bat_sysfs.c | |
| parent | c5216cc70fa769e5a51837f2cf07c4a0aa734fcf (diff) | |
| parent | 27aea2128ec09924dfe08e97739b2bf8b15c8619 (diff) | |
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
Diffstat (limited to 'net/batman-adv/bat_sysfs.c')
| -rw-r--r-- | net/batman-adv/bat_sysfs.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/net/batman-adv/bat_sysfs.c b/net/batman-adv/bat_sysfs.c index e449bf6353e0..497a0700cc3c 100644 --- a/net/batman-adv/bat_sysfs.c +++ b/net/batman-adv/bat_sysfs.c @@ -488,22 +488,24 @@ static ssize_t store_mesh_iface(struct kobject *kobj, struct attribute *attr, (strncmp(hard_iface->soft_iface->name, buff, IFNAMSIZ) == 0)) goto out; + if (!rtnl_trylock()) { + ret = -ERESTARTSYS; + goto out; + } + if (status_tmp == IF_NOT_IN_USE) { - rtnl_lock(); hardif_disable_interface(hard_iface); - rtnl_unlock(); - goto out; + goto unlock; } /* if the interface already is in use */ - if (hard_iface->if_status != IF_NOT_IN_USE) { - rtnl_lock(); + if (hard_iface->if_status != IF_NOT_IN_USE) hardif_disable_interface(hard_iface); - rtnl_unlock(); - } ret = hardif_enable_interface(hard_iface, buff); +unlock: + rtnl_unlock(); out: hardif_free_ref(hard_iface); return ret; |