From patchwork Sat Apr 11 19:29:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Priestley X-Patchwork-Id: 6201711 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B6566BF4A6 for ; Sat, 11 Apr 2015 19:30:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DE3072013D for ; Sat, 11 Apr 2015 19:30:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 00F292013A for ; Sat, 11 Apr 2015 19:30:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755320AbbDKTaA (ORCPT ); Sat, 11 Apr 2015 15:30:00 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:36744 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755249AbbDKT35 (ORCPT ); Sat, 11 Apr 2015 15:29:57 -0400 Received: by wizk4 with SMTP id k4so30726087wiz.1; Sat, 11 Apr 2015 12:29:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=94p8JTd9mybcRisIwbNqsIjymwc1AAU9dVfXOp5Rv/M=; b=ZStMaXLN7XrsbobBK46uNytlsqslXNrhgZ688ggqPeqdnYEBoYL06Qd4+8tJ/x3GRa cGCA3ffxqPp4Wj7qTnRq71fSJHoCz804YvjEGRYgI4n4109PsosqDYB4VLki0FqcwoDB FxZ29aaQz+91fAWy68yLk6Jf6e4DXJd+f6gHCyvHiocYRsgtaTkMFTh6lfZZW27FMzbw POqSyP/ysFVo/XUNXZGUmIAIUD1CoVdYK5SEOAoo5zpXeHASB0Hvqg0rYEKJFKlldiQT 3stdEZoUULCj4lkax/KsgZQat9dDkHMINiZz5i65a8E/nIaVD9nr7pBqi9Azu/FNBfEh /CYQ== X-Received: by 10.180.92.138 with SMTP id cm10mr7612704wib.51.1428780596144; Sat, 11 Apr 2015 12:29:56 -0700 (PDT) Received: from tipsey.3.home (188.31.7.105.threembb.co.uk. [188.31.7.105]) by mx.google.com with ESMTPSA id hl8sm3992946wjb.38.2015.04.11.12.29.54 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 11 Apr 2015 12:29:55 -0700 (PDT) From: Malcolm Priestley To: gregkh@linuxfoundation.org Cc: linux-wireless@vger.kernel.org, Malcolm Priestley , Subject: [PATCH] staging: vt6655: Fix 80211 control and management status reporting. Date: Sat, 11 Apr 2015 20:29:41 +0100 Message-Id: <1428780581-6393-1-git-send-email-tvboxspy@gmail.com> X-Mailer: git-send-email 2.1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Cc: # v3.19+ --- drivers/staging/vt6655/device_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 521d44f..c5f8233 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) /* Only the status of first TD in the chain is correct */ if (pTD->m_td1TD1.byTCR & TCR_STP) { if ((pTD->pTDInfo->byFlags & TD_FLAGS_NETIF_SKB) != 0) { - - vnt_int_report_rate(pDevice, pTD->pTDInfo, byTsr0, byTsr1); - if (!(byTsr1 & TSR1_TERR)) { if (byTsr0 != 0) { 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) (int)uIdx, byTsr1, byTsr0); } } + + vnt_int_report_rate(pDevice, pTD->pTDInfo, byTsr0, byTsr1); + device_free_tx_buf(pDevice, pTD); pDevice->iTDUsed[uIdx]--; }