aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2014-11-28 11:41:14 -0500
committerJohn W. Linville <linville@tuxdriver.com>2014-12-01 15:22:02 -0500
commit99a82f734aa6c6d397e029e6dfa933f04e0fa8c8 (patch)
treed7bccce3279060ca3c812f67b04032b3b5e2eeb5
parent7d63a5f9b25ba6b130da8eb2d32a72b1462d0249 (diff)
rtlwifi: rtl8192ce: Fix editing error that causes silent memory corruption
In the major update of the rtlwifi-family of drivers, there was an editing mistake. Unfortunately, this particular error leads to memory corruption that silently leads to failure of the system. This patch is one of three needed to fix the kernel regression reported at https://bugzilla.kernel.org/show_bug.cgi?id=88951. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Reported-by: Catalin Iacob <iacobcatalin@gmail.com> Tested-by: Catalin Iacob <iacobcatalin@gmail.com> Cc: Catalin Iacob <iacobcatalin@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192ce/trx.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
index dc3d20b17a26..0916275c7362 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
@@ -720,16 +720,15 @@ u32 rtl92ce_get_desc(u8 *p_desc, bool istx, u8 desc_name)
720 break; 720 break;
721 } 721 }
722 } else { 722 } else {
723 struct rx_desc_92c *pdesc = (struct rx_desc_92c *)p_desc;
724 switch (desc_name) { 723 switch (desc_name) {
725 case HW_DESC_OWN: 724 case HW_DESC_OWN:
726 ret = GET_RX_DESC_OWN(pdesc); 725 ret = GET_RX_DESC_OWN(p_desc);
727 break; 726 break;
728 case HW_DESC_RXPKT_LEN: 727 case HW_DESC_RXPKT_LEN:
729 ret = GET_RX_DESC_PKT_LEN(pdesc); 728 ret = GET_RX_DESC_PKT_LEN(p_desc);
730 break; 729 break;
731 case HW_DESC_RXBUFF_ADDR: 730 case HW_DESC_RXBUFF_ADDR:
732 ret = GET_RX_STATUS_DESC_BUFF_ADDR(pdesc); 731 ret = GET_RX_DESC_BUFF_ADDR(p_desc);
733 break; 732 break;
734 default: 733 default:
735 RT_ASSERT(false, "ERR rxdesc :%d not process\n", 734 RT_ASSERT(false, "ERR rxdesc :%d not process\n",