Attachment #278571 for bug #201105

Lines 151-162 int iwl_acpi_get_mcc(struct device dev, char mcc) Link Here

(-)a/drivers/net/wireless/intel/iwlwifi/fw/acpi.c (-1 / +8 lines)
151	u32 mcc_val;	151	u32 mcc_val;
152	int ret;	152	int ret;
153		153
		154	IWL_WARN_DEV(dev, "%s %d\n", __func__, __LINE__);
		155
154	data = iwl_acpi_get_object(dev, ACPI_WRDD_METHOD);	156	data = iwl_acpi_get_object(dev, ACPI_WRDD_METHOD);
155	if (IS_ERR(data))	157	if (IS_ERR(data)) {
		158	IWL_WARN_DEV(dev, "%s %d\n", __func__, __LINE__);
156	return PTR_ERR(data);	159	return PTR_ERR(data);
		160	}
		161	IWL_WARN_DEV(dev, "%s %d\n", __func__, __LINE__);
157		162
158	wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_WRDD_WIFI_DATA_SIZE);	163	wifi_pkg = iwl_acpi_get_wifi_pkg(dev, data, ACPI_WRDD_WIFI_DATA_SIZE);
159	if (IS_ERR(wifi_pkg)) {	164	if (IS_ERR(wifi_pkg)) {
		165	IWL_WARN_DEV(dev, "%s %d\n", __func__, __LINE__);
160	ret = PTR_ERR(wifi_pkg);	166	ret = PTR_ERR(wifi_pkg);
161	goto out_free;	167	goto out_free;
162	}	168	}
Lines 174-179 int iwl_acpi_get_mcc(struct device dev, char mcc) Link Here
174		180
175	ret = 0;	181	ret = 0;
176	out_free:	182	out_free:
		183	IWL_WARN_DEV(dev, "%s %d OUT with %d\n", __func__, __LINE__, ret);
177	kfree(data);	184	kfree(data);
178	return ret;	185	return ret;
179	}	186	}

Lines 586-605 int iwl_mvm_init_mcc(struct iwl_mvm *mvm) Link Here

(-)a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c (-1 / +10 lines)
586	*/	586	*/
587	mvm->lar_regdom_set = false;	587	mvm->lar_regdom_set = false;
588		588
		589
		590	IWL_ERR(mvm,"%s %d\n", __func__, __LINE__);
		591
589	regd = iwl_mvm_get_current_regdomain(mvm, NULL);	592	regd = iwl_mvm_get_current_regdomain(mvm, NULL);
590	if (IS_ERR_OR_NULL(regd))	593	if (IS_ERR_OR_NULL(regd))
591	return -EIO;	594	return -EIO;
		595	IWL_ERR(mvm, "%s %d - MCC supported? %d\n", __func__, __LINE__, iwl_mvm_is_wifi_mcc_supported(mvm));
		596	IWL_ERR(mvm, "%s %d - iwl_acpi_get_mcc returned %d\n", __func__, __LINE__, iwl_acpi_get_mcc(mvm->dev, mcc));
592		597
593	if (iwl_mvm_is_wifi_mcc_supported(mvm) &&	598	if (iwl_mvm_is_wifi_mcc_supported(mvm) &&
594	!iwl_acpi_get_mcc(mvm->dev, mcc)) {	599	!iwl_acpi_get_mcc(mvm->dev, mcc)) {
		600	IWL_ERR(mvm,"%s %d\n", __func__, __LINE__);
595	kfree(regd);	601	kfree(regd);
596	regd = iwl_mvm_get_regdomain(mvm->hw->wiphy, mcc,	602	regd = iwl_mvm_get_regdomain(mvm->hw->wiphy, mcc,
597	MCC_SOURCE_BIOS, NULL);	603	MCC_SOURCE_BIOS, NULL);
598	if (IS_ERR_OR_NULL(regd))	604	if (IS_ERR_OR_NULL(regd)) {
		605	IWL_ERR(mvm,"%s %d\n", __func__, __LINE__);
599	return -EIO;	606	return -EIO;
		607	}
600	}	608	}
601		609
602	retval = regulatory_set_wiphy_regd_sync_rtnl(mvm->hw->wiphy, regd);	610	retval = regulatory_set_wiphy_regd_sync_rtnl(mvm->hw->wiphy, regd);
		611	IWL_ERR(mvm,"%s %d - cfg80211 updated!\n", __func__, __LINE__);
603	kfree(regd);	612	kfree(regd);
604	return retval;	613	return retval;
605	}	614	}

Return to bug 201105