diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-08 12:46:17 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-08 12:46:17 -0700 |
| commit | a8679be2073392cf22a910bc25da0c7d36459845 (patch) | |
| tree | 0d25750ea4ba3a85fe683f285261083d77080976 /net/wireless/reg.c | |
| parent | 22f6dacdfcfdc792d068e9c41234808860498d04 (diff) | |
| parent | 9dfd6ba353b993d648dcda72480c7ce92cd27c7e (diff) | |
| download | linux-a8679be2073392cf22a910bc25da0c7d36459845.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/wireless/reg.c')
| -rw-r--r-- | net/wireless/reg.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 139d13fdc94f..537af62ec42b 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -2113,14 +2113,14 @@ void reg_device_remove(struct wiphy *wiphy) assert_cfg80211_lock(); + kfree(wiphy->regd); + if (last_request) request_wiphy = wiphy_idx_to_wiphy(last_request->wiphy_idx); - kfree(wiphy->regd); - if (!last_request || !request_wiphy) - return; - if (request_wiphy != wiphy) + if (!request_wiphy || request_wiphy != wiphy) return; + last_request->wiphy_idx = WIPHY_IDX_STALE; last_request->country_ie_env = ENVIRON_ANY; } |