Merge "regulatory: use correct regulatory initiator on wiphy register"

This commit is contained in:
Linux Build Service Account 2014-02-02 14:30:30 -08:00 committed by Gerrit - the friendly Code Review server
commit e208240265

View file

@ -2304,12 +2304,15 @@ int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env)
void wiphy_regulatory_register(struct wiphy *wiphy)
{
struct regulatory_request *lr;
mutex_lock(&reg_mutex);
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);
mutex_unlock(&reg_mutex);
}