diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-08-01 14:30:59 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-08-01 14:30:59 -0400 |
commit | 22e02a0272e5291a40ca28d2b7aea5231c832077 (patch) | |
tree | 04630aa6452458c643a3af6fd2c296609beef2c6 /net/wireless/reg.c | |
parent | b00589af3b04736376f24625ab0b394642e89e29 (diff) | |
parent | 11a45820d02ee78ad22bb95d5abb94950a355d8d (diff) | |
download | linux-22e02a0272e5291a40ca28d2b7aea5231c832077.tar.gz linux-22e02a0272e5291a40ca28d2b7aea5231c832077.tar.bz2 linux-22e02a0272e5291a40ca28d2b7aea5231c832077.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/wireless/reg.c')
-rw-r--r-- | net/wireless/reg.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 5a950f36bae4..de06d5d1287f 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -2247,10 +2247,13 @@ int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env) void wiphy_regulatory_register(struct wiphy *wiphy) { + struct regulatory_request *lr; + if (!reg_dev_ignore_cell_hint(wiphy)) reg_num_devs_support_basehint++; - wiphy_update_regulatory(wiphy, NL80211_REGDOM_SET_BY_CORE); + lr = get_last_request(); + wiphy_update_regulatory(wiphy, lr->initiator); } void wiphy_regulatory_deregister(struct wiphy *wiphy) |