Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 645af8b3 authored by abhinav kumar's avatar abhinav kumar Committed by Madan Koyyalamudi
Browse files

qcacld-3.0: Move 6ghz check in band bitmap conversion API 

Move the 6GHz support check so that the logic is invoked
regardless of the input band bitmap.

Change-Id: I45db2d2be8966ac073a8ede721d52bd689a98a88
CRs-Fixed: 3069557
parent 0aebd555

core/hdd/src/wlan_hdd_cfg80211.c

+6 −7
Original line number Original line Diff line number Diff line
@@ -12814,14 +12814,8 @@ wlan_vendor_bitmap_to_reg_wifi_band_bitmap(struct wlan_objmgr_psoc *psoc, 
{

{

	uint32_t reg_bitmap = 0;

	uint32_t reg_bitmap = 0;

















	if (vendor_bitmap == QCA_SETBAND_AUTO) {







	if (vendor_bitmap == QCA_SETBAND_AUTO)











		reg_bitmap |= REG_BAND_MASK_ALL;







		reg_bitmap |= REG_BAND_MASK_ALL;











		if (!wlan_reg_is_6ghz_supported(psoc)) {














			hdd_debug("Driver doesn't support 6ghz");














			reg_bitmap = (reg_bitmap & (~BIT(REG_BAND_6G)));














		}














	}



























	if (vendor_bitmap & QCA_SETBAND_2G)







	if (vendor_bitmap & QCA_SETBAND_2G)











		reg_bitmap |= BIT(REG_BAND_2G);







		reg_bitmap |= BIT(REG_BAND_2G);











	if (vendor_bitmap & QCA_SETBAND_5G)







	if (vendor_bitmap & QCA_SETBAND_5G)









@@ -12829,6 +12823,11 @@ wlan_vendor_bitmap_to_reg_wifi_band_bitmap(struct wlan_objmgr_psoc *psoc,









	if (vendor_bitmap & QCA_SETBAND_6G)







	if (vendor_bitmap & QCA_SETBAND_6G)











		reg_bitmap |= BIT(REG_BAND_6G);







		reg_bitmap |= BIT(REG_BAND_6G);






























	if (!wlan_reg_is_6ghz_supported(psoc)) {














		hdd_debug("Driver doesn't support 6ghz");














		reg_bitmap = (reg_bitmap & (~BIT(REG_BAND_6G)));














	}
























	return reg_bitmap;







	return reg_bitmap;











}







}