diff options
author | Mark Brown <broonie@linaro.org> | 2013-11-13 12:06:53 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-11-13 12:06:53 +0000 |
commit | 4cb518ab3d962ac6d0249f47a512127364ddf7da (patch) | |
tree | 83273e3360c39ec70f0fb3f4f2829b5ce190b6ad /drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | |
parent | 47cf66ff098ac408194713be6531a7bb57d1b99b (diff) | |
parent | 54a3a4d441e9eaceb86989f0b466e77815ab6129 (diff) |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192cu/trx.c')
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 3 |
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 763cf1defab..5a060e537fb 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); } |