diff options
author | Michal Kazior <michal.kazior@tieto.com> | 2012-06-29 06:47:08 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2012-06-29 07:39:19 -0400 |
commit | e4e32459c2daea59516da59999706b357e6eb480 (patch) | |
tree | 110014ac72ebcf7aed16caa0fa83da75e319fa86 /net/wireless/core.c | |
parent | d4e50c5917e110451ced8f8de594cea858791f37 (diff) |
cfg80211: respect iface combinations when starting operation
devlist_mtx locking is changed to accomodate changes.
Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/core.c')
-rw-r--r-- | net/wireless/core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index b26695ad3e97..ca2b95f24846 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c | |||
@@ -990,7 +990,9 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb, | |||
990 | return notifier_from_errno(-EOPNOTSUPP); | 990 | return notifier_from_errno(-EOPNOTSUPP); |
991 | if (rfkill_blocked(rdev->rfkill)) | 991 | if (rfkill_blocked(rdev->rfkill)) |
992 | return notifier_from_errno(-ERFKILL); | 992 | return notifier_from_errno(-ERFKILL); |
993 | mutex_lock(&rdev->devlist_mtx); | ||
993 | ret = cfg80211_can_add_interface(rdev, wdev->iftype); | 994 | ret = cfg80211_can_add_interface(rdev, wdev->iftype); |
995 | mutex_unlock(&rdev->devlist_mtx); | ||
994 | if (ret) | 996 | if (ret) |
995 | return notifier_from_errno(ret); | 997 | return notifier_from_errno(ret); |
996 | cfg80211_lock_rdev(rdev); | 998 | cfg80211_lock_rdev(rdev); |