summaryrefslogtreecommitdiff
path: root/net/wireless/wext-compat.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-02-22 11:53:05 -0800
committerDavid S. Miller <davem@davemloft.net>2011-02-22 11:53:05 -0800
commitd3bd1b4c89cceca42211cd5bd30508b903267229 (patch)
treeab3459496e3c9d8b1904b440b1a19c72ff23b3f0 /net/wireless/wext-compat.c
parent28801f351f76231e8d1e378274d6d56a577b897e (diff)
parent0bf719dfdecc5552155cbec78e49fa06e531e35c (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/wireless/wext-compat.c')
-rw-r--r--net/wireless/wext-compat.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index 3e5dbd4e4cd5..d112f038edf0 100644
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -802,11 +802,11 @@ int cfg80211_wext_siwfreq(struct net_device *dev,
return freq;
if (freq == 0)
return -EINVAL;
- wdev_lock(wdev);
mutex_lock(&rdev->devlist_mtx);
+ wdev_lock(wdev);
err = cfg80211_set_freq(rdev, wdev, freq, NL80211_CHAN_NO_HT);
- mutex_unlock(&rdev->devlist_mtx);
wdev_unlock(wdev);
+ mutex_unlock(&rdev->devlist_mtx);
return err;
default:
return -EOPNOTSUPP;