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

Commit 5c99f04f authored by Larry Finger's avatar Larry Finger Committed by John W. Linville
Browse files

rtlwifi: rtl8723be: Update driver to match Realtek release of 06/28/14 



This patch updates the driver to match the latest Realtek release, and
it is an important step in getting the internal code source at Realtek to match
the code in the kernel. The primary reason for this is to make it easier for
Realtek to maintain the kernel source without requiring an intermediate like me.

In this process of merging the two source repositories, there are a lot
of changes in both, and this commit is rather large.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0529c6b8

drivers/net/wireless/rtlwifi/rtl8192ce/trx.c

+2 −2
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static void _rtl92ce_query_rxphystatus(struct ieee80211_hw *hw, 
	u32 rssi, total_rssi = 0;

	bool is_cck_rate;



	is_cck_rate = RX_HAL_IS_CCK_RATE(pdesc);

	is_cck_rate = RX_HAL_IS_CCK_RATE(pdesc->rxmcs);

	pstats->packet_matchbssid = packet_match_bssid;

	pstats->packet_toself = packet_toself;

	pstats->is_cck = is_cck_rate;
@@ -361,7 +361,7 @@ bool rtl92ce_rx_query_desc(struct ieee80211_hw *hw, 
	stats->rx_is40Mhzpacket = (bool) GET_RX_DESC_BW(pdesc);

	stats->is_ht = (bool)GET_RX_DESC_RXHT(pdesc);



	stats->is_cck = RX_HAL_IS_CCK_RATE(pdesc);

	stats->is_cck = RX_HAL_IS_CCK_RATE(pdesc->rxmcs);



	rx_status->freq = hw->conf.chandef.chan->center_freq;

	rx_status->band = hw->conf.chandef.chan->band;

drivers/net/wireless/rtlwifi/rtl8192cu/mac.c

+1 −1
Original line number Diff line number Diff line
@@ -786,7 +786,7 @@ static void _rtl92c_query_rxphystatus(struct ieee80211_hw *hw, 
	bool is_cck_rate;

	u8 *pdesc = (u8 *)p_desc;



	is_cck_rate = RX_HAL_IS_CCK_RATE(p_desc);

	is_cck_rate = RX_HAL_IS_CCK_RATE(p_desc->rxmcs);

	pstats->packet_matchbssid = packet_match_bssid;

	pstats->packet_toself = packet_toself;

	pstats->packet_beacon = packet_beacon;

drivers/net/wireless/rtlwifi/rtl8192de/trx.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static void _rtl92de_query_rxphystatus(struct ieee80211_hw *hw, 
	u32 rssi, total_rssi = 0;

	bool is_cck_rate;



	is_cck_rate = RX_HAL_IS_CCK_RATE(pdesc);

	is_cck_rate = RX_HAL_IS_CCK_RATE(pdesc->rxmcs);

	pstats->packet_matchbssid = packet_match_bssid;

	pstats->packet_toself = packet_toself;

	pstats->packet_beacon = packet_beacon;

drivers/net/wireless/rtlwifi/rtl8723ae/fw.h

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
#define FW_8192C_END_ADDRESS			0x3FFF

#define FW_8192C_PAGE_SIZE				4096

#define FW_8192C_POLLING_DELAY			5

#define FW_8192C_POLLING_TIMEOUT_COUNT	1000



#define IS_FW_HEADER_EXIST(_pfwhdr)	\

	((_pfwhdr->signature&0xFFFF) == 0x2300 ||\

drivers/net/wireless/rtlwifi/rtl8723ae/hw.c

+1 −1
Original line number Diff line number Diff line
@@ -963,7 +963,7 @@ int rtl8723e_hw_init(struct ieee80211_hw *hw) 
		goto exit;

	}



	err = rtl8723_download_fw(hw, false, FW_8192C_POLLING_TIMEOUT_COUNT);

	err = rtl8723_download_fw(hw, false, FW_8723A_POLLING_TIMEOUT_COUNT);

	if (err) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,

			 "Failed to download FW. Init HW without FW now..\n");