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

Commit 8a55698f authored by Jes Sorensen's avatar Jes Sorensen Committed by Kalle Valo
Browse files

rtl8xxxu: Fix big-endian problem reporting mactime 



The full RX descriptor is converted so converting tsfl again would
return it to it's original endian value.

Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Cc: stable@vger.kernel.org # 4.8+
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 1e54134c

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h

+2 −2
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ struct rtl8xxxu_rxdesc16 { 
	u32 pattern1match:1;

	u32 pattern0match:1;

#endif

	__le32 tsfl;

	u32 tsfl;

#if 0

	u32 bassn:12;

	u32 bavld:1;
@@ -368,7 +368,7 @@ struct rtl8xxxu_rxdesc24 { 
	u32 ldcp:1;

	u32 splcp:1;

#endif

	__le32 tsfl;

	u32 tsfl;

};



struct rtl8xxxu_txdesc32 {

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c

+2 −2
Original line number Diff line number Diff line
@@ -5220,7 +5220,7 @@ int rtl8xxxu_parse_rxdesc16(struct rtl8xxxu_priv *priv, struct sk_buff *skb) 
			rtl8xxxu_rx_parse_phystats(priv, rx_status, phy_stats,

						   rx_desc->rxmcs);



		rx_status->mactime = le32_to_cpu(rx_desc->tsfl);

		rx_status->mactime = rx_desc->tsfl;

		rx_status->flag |= RX_FLAG_MACTIME_START;



		if (!rx_desc->swdec)
@@ -5290,7 +5290,7 @@ int rtl8xxxu_parse_rxdesc24(struct rtl8xxxu_priv *priv, struct sk_buff *skb) 
		rtl8xxxu_rx_parse_phystats(priv, rx_status, phy_stats,

					   rx_desc->rxmcs);



	rx_status->mactime = le32_to_cpu(rx_desc->tsfl);

	rx_status->mactime = rx_desc->tsfl;

	rx_status->flag |= RX_FLAG_MACTIME_START;



	if (!rx_desc->swdec)