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

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

rtlwifi: rtl8192cu: Fix more pointer arithmetic errors 



This driver uses a number of macros to get and set various fields in the
RX and TX descriptors. To work correctly, a u8 pointer to the descriptor
must be used; however, in some cases a descriptor structure pointer is used
instead. In addition, a duplicated statement is removed.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Reported-by: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Cc: Stable <stable@vger.kernel.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 353d2a69

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

+3 −3
Original line number Diff line number Diff line
@@ -769,7 +769,7 @@ static long _rtl92c_signal_scale_mapping(struct ieee80211_hw *hw, 


static void _rtl92c_query_rxphystatus(struct ieee80211_hw *hw,

				      struct rtl_stats *pstats,

				      struct rx_desc_92c *pdesc,

				      struct rx_desc_92c *p_desc,

				      struct rx_fwinfo_92c *p_drvinfo,

				      bool packet_match_bssid,

				      bool packet_toself,
@@ -784,11 +784,11 @@ static void _rtl92c_query_rxphystatus(struct ieee80211_hw *hw, 
	u32 rssi, total_rssi = 0;

	bool in_powersavemode = false;

	bool is_cck_rate;

	u8 *pdesc = (u8 *)p_desc;



	is_cck_rate = RX_HAL_IS_CCK_RATE(pdesc);

	is_cck_rate = RX_HAL_IS_CCK_RATE(p_desc);

	pstats->packet_matchbssid = packet_match_bssid;

	pstats->packet_toself = packet_toself;

	pstats->is_cck = is_cck_rate;

	pstats->packet_beacon = packet_beacon;

	pstats->is_cck = is_cck_rate;

	pstats->RX_SIGQ[0] = -1;

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

+3 −3
Original line number Diff line number Diff line
@@ -303,10 +303,10 @@ out: 
bool rtl92cu_rx_query_desc(struct ieee80211_hw *hw,

			   struct rtl_stats *stats,

			   struct ieee80211_rx_status *rx_status,

			   u8 *p_desc, struct sk_buff *skb)

			   u8 *pdesc, struct sk_buff *skb)

{

	struct rx_fwinfo_92c *p_drvinfo;

	struct rx_desc_92c *pdesc = (struct rx_desc_92c *)p_desc;

	struct rx_desc_92c *p_desc = (struct rx_desc_92c *)pdesc;

	u32 phystatus = GET_RX_DESC_PHY_STATUS(pdesc);



	stats->length = (u16) GET_RX_DESC_PKT_LEN(pdesc);
@@ -345,7 +345,7 @@ bool rtl92cu_rx_query_desc(struct ieee80211_hw *hw, 
	if (phystatus) {

		p_drvinfo = (struct rx_fwinfo_92c *)(skb->data +

						     stats->rx_bufshift);

		rtl92c_translate_rx_signal_stuff(hw, skb, stats, pdesc,

		rtl92c_translate_rx_signal_stuff(hw, skb, stats, p_desc,

						 p_drvinfo);

	}

	/*rx_status->qual = stats->signal; */