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

Commit 0d3b9dd1 authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by John W. Linville
Browse files

brcmsmac: add a conditions for core rev 17 again 



This reverts some changes made in this commit:
commit 72345923
Author: Roland Vossen <rvossen@broadcom.com>
Date:   Mon Feb 14 12:16:45 2011 +0100

    staging: brcm80211: removal of inactive d11 code

The bcm4716 has a rev 17 wireless core and this condition is needed.

Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Acked-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a5fed0c1

drivers/net/wireless/brcm80211/brcmsmac/main.c

+4 −2
Original line number Diff line number Diff line
@@ -1942,6 +1942,7 @@ static bool brcms_b_radio_read_hwdisabled(struct brcms_hardware *wlc_hw) 
		 * accesses phyreg throughput mac. This can be skipped since

		 * only mac reg is accessed below

		 */

		if (D11REV_GE(wlc_hw->corerev, 18))

			flags |= SICF_PCLKE;



		/*
@@ -2023,6 +2024,7 @@ void brcms_b_corereset(struct brcms_hardware *wlc_hw, u32 flags) 
	 * phyreg throughput mac, AND phy_reset is skipped at early stage when

	 * band->pi is invalid. need to enable PHY CLK

	 */

	if (D11REV_GE(wlc_hw->corerev, 18))

		flags |= SICF_PCLKE;



	/*