diff options
| author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2016-09-29 15:40:55 -0400 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2016-10-07 07:22:35 -0400 |
| commit | 8a55698f2f29d227825173420d7b99b9277ca88c (patch) | |
| tree | 36de3f0041fedfc300785d5e676cc2119954bee5 /drivers/net/wireless/realtek | |
| parent | 1e54134ccad00f76ddf00f3e77db3dc8fdefbb47 (diff) | |
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>
Diffstat (limited to 'drivers/net/wireless/realtek')
| -rw-r--r-- | drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h index 1016628926d2..08d587a342d3 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | |||
| @@ -238,7 +238,7 @@ struct rtl8xxxu_rxdesc16 { | |||
| 238 | u32 pattern1match:1; | 238 | u32 pattern1match:1; |
| 239 | u32 pattern0match:1; | 239 | u32 pattern0match:1; |
| 240 | #endif | 240 | #endif |
| 241 | __le32 tsfl; | 241 | u32 tsfl; |
| 242 | #if 0 | 242 | #if 0 |
| 243 | u32 bassn:12; | 243 | u32 bassn:12; |
| 244 | u32 bavld:1; | 244 | u32 bavld:1; |
| @@ -368,7 +368,7 @@ struct rtl8xxxu_rxdesc24 { | |||
| 368 | u32 ldcp:1; | 368 | u32 ldcp:1; |
| 369 | u32 splcp:1; | 369 | u32 splcp:1; |
| 370 | #endif | 370 | #endif |
| 371 | __le32 tsfl; | 371 | u32 tsfl; |
| 372 | }; | 372 | }; |
| 373 | 373 | ||
| 374 | struct rtl8xxxu_txdesc32 { | 374 | struct rtl8xxxu_txdesc32 { |
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c index a96ff17759e4..a5e6ec2152bf 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | |||
| @@ -5220,7 +5220,7 @@ int rtl8xxxu_parse_rxdesc16(struct rtl8xxxu_priv *priv, struct sk_buff *skb) | |||
| 5220 | rtl8xxxu_rx_parse_phystats(priv, rx_status, phy_stats, | 5220 | rtl8xxxu_rx_parse_phystats(priv, rx_status, phy_stats, |
| 5221 | rx_desc->rxmcs); | 5221 | rx_desc->rxmcs); |
| 5222 | 5222 | ||
| 5223 | rx_status->mactime = le32_to_cpu(rx_desc->tsfl); | 5223 | rx_status->mactime = rx_desc->tsfl; |
| 5224 | rx_status->flag |= RX_FLAG_MACTIME_START; | 5224 | rx_status->flag |= RX_FLAG_MACTIME_START; |
| 5225 | 5225 | ||
| 5226 | if (!rx_desc->swdec) | 5226 | if (!rx_desc->swdec) |
| @@ -5290,7 +5290,7 @@ int rtl8xxxu_parse_rxdesc24(struct rtl8xxxu_priv *priv, struct sk_buff *skb) | |||
| 5290 | rtl8xxxu_rx_parse_phystats(priv, rx_status, phy_stats, | 5290 | rtl8xxxu_rx_parse_phystats(priv, rx_status, phy_stats, |
| 5291 | rx_desc->rxmcs); | 5291 | rx_desc->rxmcs); |
| 5292 | 5292 | ||
| 5293 | rx_status->mactime = le32_to_cpu(rx_desc->tsfl); | 5293 | rx_status->mactime = rx_desc->tsfl; |
| 5294 | rx_status->flag |= RX_FLAG_MACTIME_START; | 5294 | rx_status->flag |= RX_FLAG_MACTIME_START; |
| 5295 | 5295 | ||
| 5296 | if (!rx_desc->swdec) | 5296 | if (!rx_desc->swdec) |
