aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMalcolm Priestley <tvboxspy@gmail.com>2015-04-11 15:29:41 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-05-08 08:28:05 -0400
commitad3fee9b17b90b8f1ac94b615111b2f14dd90adb (patch)
tree5b2490de6f53e71625b64e244b49a0756cbf514b
parent6e44dc4be009eef60a1744e4a4b830131f6b9a8e (diff)
staging: vt6655: Fix 80211 control and management status reporting.
Currently only TD_FLAGS_NETIF_SKB are reported back to mac80211. Move vnt_int_report_rate to report all frame types. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Cc: <stable@vger.kernel.org> # v3.19+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/vt6655/device_main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 6d3df9514088..c81776363d8e 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -941,9 +941,6 @@ static int device_tx_srv(struct vnt_private *pDevice, unsigned int uIdx)
941 /* Only the status of first TD in the chain is correct */ 941 /* Only the status of first TD in the chain is correct */
942 if (pTD->m_td1TD1.byTCR & TCR_STP) { 942 if (pTD->m_td1TD1.byTCR & TCR_STP) {
943 if ((pTD->pTDInfo->byFlags & TD_FLAGS_NETIF_SKB) != 0) { 943 if ((pTD->pTDInfo->byFlags & TD_FLAGS_NETIF_SKB) != 0) {
944
945 vnt_int_report_rate(pDevice, pTD->pTDInfo, byTsr0, byTsr1);
946
947 if (!(byTsr1 & TSR1_TERR)) { 944 if (!(byTsr1 & TSR1_TERR)) {
948 if (byTsr0 != 0) { 945 if (byTsr0 != 0) {
949 pr_debug(" Tx[%d] OK but has error. tsr1[%02X] tsr0[%02X]\n", 946 pr_debug(" Tx[%d] OK but has error. tsr1[%02X] tsr0[%02X]\n",
@@ -962,6 +959,9 @@ static int device_tx_srv(struct vnt_private *pDevice, unsigned int uIdx)
962 (int)uIdx, byTsr1, byTsr0); 959 (int)uIdx, byTsr1, byTsr0);
963 } 960 }
964 } 961 }
962
963 vnt_int_report_rate(pDevice, pTD->pTDInfo, byTsr0, byTsr1);
964
965 device_free_tx_buf(pDevice, pTD); 965 device_free_tx_buf(pDevice, pTD);
966 pDevice->iTDUsed[uIdx]--; 966 pDevice->iTDUsed[uIdx]--;
967 } 967 }