aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>2013-10-08 10:18:20 -0500
committerJohn W. Linville <linville@tuxdriver.com>2013-10-10 14:05:41 -0400
commit9473ca6e920a3b9ca902753ce52833657f9221cc (patch)
tree0af41a9f2cf0c83b9d895ac75b64fb7d19b9fb1d
parentc380a1fda55c7853c5e767998365247f4030ef3b (diff)
downloadkernel_goldelico_gta04-9473ca6e920a3b9ca902753ce52833657f9221cc.zip
kernel_goldelico_gta04-9473ca6e920a3b9ca902753ce52833657f9221cc.tar.gz
kernel_goldelico_gta04-9473ca6e920a3b9ca902753ce52833657f9221cc.tar.bz2
rtlwifi: rtl8192cu: Fix error in pointer arithmetic
An error in calculating the offset in an skb causes the driver to read essential device info from the wrong locations. The main effect is that automatic gain calculations are nonsense. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Cc: Stable <stable@vger.kernel.org> [2.6.39+] Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192cu/trx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
index 763cf1d..5a060e5 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c
@@ -343,7 +343,8 @@ bool rtl92cu_rx_query_desc(struct ieee80211_hw *hw,
(bool)GET_RX_DESC_PAGGR(pdesc));
rx_status->mactime = GET_RX_DESC_TSFL(pdesc);
if (phystatus) {
- p_drvinfo = (struct rx_fwinfo_92c *)(pdesc + RTL_RX_DESC_SIZE);
+ p_drvinfo = (struct rx_fwinfo_92c *)(skb->data +
+ stats->rx_bufshift);
rtl92c_translate_rx_signal_stuff(hw, skb, stats, pdesc,
p_drvinfo);
}