Commit 38fcdcbd authored by Larry Finger's avatar Larry Finger Committed by Kalle Valo

rtlwifi: rtl8188ee: Fix incorrect returned values

In commit 36eda756 ("rtlwifi: rtl8188ee: Convert macros that set
descriptor"), all the routines that get fields from a descriptor were
changed to return signed integer values. This is incorrect for the
routines that get the entire 32-bit word. In this case, an unsigned
quantity is required.

Fixes: 36eda756 ("rtlwifi: rtl8188ee: Convert macros that set descriptor")
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 3bf404b4
...@@ -244,7 +244,7 @@ static inline void set_tx_desc_tx_buffer_address(__le32 *__pdesc, u32 __val) ...@@ -244,7 +244,7 @@ static inline void set_tx_desc_tx_buffer_address(__le32 *__pdesc, u32 __val)
*(__pdesc + 8) = cpu_to_le32(__val); *(__pdesc + 8) = cpu_to_le32(__val);
} }
static inline int get_tx_desc_tx_buffer_address(__le32 *__pdesc) static inline u32 get_tx_desc_tx_buffer_address(__le32 *__pdesc)
{ {
return le32_to_cpu(*(__pdesc + 8)); return le32_to_cpu(*(__pdesc + 8));
} }
...@@ -464,22 +464,22 @@ static inline int get_rx_status_desc_magic_match(__le32 *__pdesc) ...@@ -464,22 +464,22 @@ static inline int get_rx_status_desc_magic_match(__le32 *__pdesc)
return le32_get_bits(*(__pdesc + 3), BIT(31)); return le32_get_bits(*(__pdesc + 3), BIT(31));
} }
static inline int get_rx_desc_iv1(__le32 *__pdesc) static inline u32 get_rx_desc_iv1(__le32 *__pdesc)
{ {
return le32_to_cpu(*(__pdesc + 4)); return le32_to_cpu(*(__pdesc + 4));
} }
static inline int get_rx_desc_tsfl(__le32 *__pdesc) static inline u32 get_rx_desc_tsfl(__le32 *__pdesc)
{ {
return le32_to_cpu(*(__pdesc + 5)); return le32_to_cpu(*(__pdesc + 5));
} }
static inline int get_rx_desc_buff_addr(__le32 *__pdesc) static inline u32 get_rx_desc_buff_addr(__le32 *__pdesc)
{ {
return le32_to_cpu(*(__pdesc + 6)); return le32_to_cpu(*(__pdesc + 6));
} }
static inline int get_rx_desc_buff_addr64(__le32 *__pdesc) static inline u32 get_rx_desc_buff_addr64(__le32 *__pdesc)
{ {
return le32_to_cpu(*(__pdesc + 7)); return le32_to_cpu(*(__pdesc + 7));
} }
...@@ -501,12 +501,12 @@ static inline int get_rx_rpt2_desc_pkt_len(__le32 *__status) ...@@ -501,12 +501,12 @@ static inline int get_rx_rpt2_desc_pkt_len(__le32 *__status)
return le32_get_bits(*(__status), GENMASK(8, 0)); return le32_get_bits(*(__status), GENMASK(8, 0));
} }
static inline int get_rx_rpt2_desc_macid_valid_1(__le32 *__status) static inline u32 get_rx_rpt2_desc_macid_valid_1(__le32 *__status)
{ {
return le32_to_cpu(*(__status + 4)); return le32_to_cpu(*(__status + 4));
} }
static inline int get_rx_rpt2_desc_macid_valid_2(__le32 *__status) static inline u32 get_rx_rpt2_desc_macid_valid_2(__le32 *__status)
{ {
return le32_to_cpu(*(__status + 5)); return le32_to_cpu(*(__status + 5));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment