openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Jes Sorensen <Jes.Sorensen@redhat.com>
Cc: stable@vger.kernel.org # 4.8+
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Jes Sorensen 2016-09-29 15:40:55 -04:00 committed by Kalle Valo
parent 1e54134cca
commit 8a55698f2f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
View File

@ -238,7 +238,7 @@ struct rtl8xxxu_rxdesc16 {
u32 pattern1match:1; u32 pattern1match:1;
u32 pattern0match:1; u32 pattern0match:1;
#endif #endif
__le32 tsfl; u32 tsfl;
#if 0 #if 0
u32 bassn:12; u32 bassn:12;
u32 bavld:1; u32 bavld:1;
@ -368,7 +368,7 @@ struct rtl8xxxu_rxdesc24 {
u32 ldcp:1; u32 ldcp:1;
u32 splcp:1; u32 splcp:1;
#endif #endif
__le32 tsfl; u32 tsfl;
}; };
struct rtl8xxxu_txdesc32 { struct rtl8xxxu_txdesc32 {

4
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
View File

@ -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, rtl8xxxu_rx_parse_phystats(priv, rx_status, phy_stats,
rx_desc->rxmcs); 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; rx_status->flag |= RX_FLAG_MACTIME_START;
if (!rx_desc->swdec) 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, rtl8xxxu_rx_parse_phystats(priv, rx_status, phy_stats,
rx_desc->rxmcs); 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; rx_status->flag |= RX_FLAG_MACTIME_START;
if (!rx_desc->swdec) if (!rx_desc->swdec)