diff options
| author |   Luis R. Rodriguez <lrodriguez@atheros.com> | 2009-02-21 00:04:25 -0500 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2009-02-27 14:52:56 -0500 |
| commit | 761cf7ecffc4bc079679e65c3b1ab107c1c1fb56 (patch) | |
| tree | bd9ff2715f6f191c31368c9efc534fdc68187705 /net/wireless/core.c | |
| parent | cfg80211: propagate -ENOMEM during regulatory_init() (diff) | |
| download | linux-dev-761cf7ecffc4bc079679e65c3b1ab107c1c1fb56.tar.xz linux-dev-761cf7ecffc4bc079679e65c3b1ab107c1c1fb56.zip | |
cfg80211: add assert_cfg80211_lock() to ensure proper protection
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/core.c')
| -rw-r--r-- | net/wireless/core.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index 39d40d1e06db..e347093ccc73 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -7,7 +7,6 @@ #include <linux/if.h> #include <linux/module.h> #include <linux/err.h> -#include <linux/mutex.h> #include <linux/list.h> #include <linux/nl80211.h> #include <linux/debugfs.h> @@ -50,6 +49,8 @@ cfg80211_drv_by_wiphy_idx(int wiphy_idx) if (!wiphy_idx_valid(wiphy_idx)) return NULL; + assert_cfg80211_lock(); + list_for_each_entry(drv, &cfg80211_drv_list, list) { if (drv->wiphy_idx == wiphy_idx) { result = drv; @@ -69,6 +70,8 @@ __cfg80211_drv_from_info(struct genl_info *info) struct net_device *dev; int err = -EINVAL; + assert_cfg80211_lock(); + if (info->attrs[NL80211_ATTR_WIPHY]) { bywiphyidx = cfg80211_drv_by_wiphy_idx( nla_get_u32(info->attrs[NL80211_ATTR_WIPHY])); |