From patchwork Thu Apr 9 19:53:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Priestley X-Patchwork-Id: 6190321 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E7A989F2E9 for ; Thu, 9 Apr 2015 19:54:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 213662037B for ; Thu, 9 Apr 2015 19:54:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E9DD520380 for ; Thu, 9 Apr 2015 19:54:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933332AbbDITyR (ORCPT ); Thu, 9 Apr 2015 15:54:17 -0400 Received: from mail-wg0-f43.google.com ([74.125.82.43]:33403 "EHLO mail-wg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755991AbbDITyP (ORCPT ); Thu, 9 Apr 2015 15:54:15 -0400 Received: by wgin8 with SMTP id n8so131203087wgi.0; Thu, 09 Apr 2015 12:54:14 -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=tWTFxuN8YMBF44arT5Kw8CYIbDEXQfWxrCJSJ4aF1v0=; b=Mo+xclwChZnmuSZBqbfm03VdZdHcm3uzZmCEgCYiG/Pxg84T6eHmSXBVhkFQNnzmM/ TFD095tMlNsUnO0b7yZ1mHCGmpGvbeOv54ZjAwm7y3BBwozrCrLEn1zdjO0KOm1D/K80 hThlbJ0wIGd4Pj+WEXSuqO2UcZrsVoWAWc3yAkn6H6RIkw7NABaAp4IY2ELiH2008yy6 ukXhgXgyfh08zUqYU36bQnSorD3uMHF0NZxv1obXH6xpDl+cGUPQjnxZ/NLJ7pMI9mzV 1avOs5OY9fCxGxJjcIhr0os83xxybelX8Wk/kpdlb0/H+1ZfHkA/Sx7EMImzc1ih9ciu AxQQ== X-Received: by 10.180.12.84 with SMTP id w20mr9289815wib.9.1428609254100; Thu, 09 Apr 2015 12:54:14 -0700 (PDT) Received: from tipsey.3.home (94.196.243.56.threembb.co.uk. [94.196.243.56]) by mx.google.com with ESMTPSA id df1sm3787664wib.12.2015.04.09.12.54.08 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Apr 2015 12:54:13 -0700 (PDT) From: Malcolm Priestley To: gregkh@linuxfoundation.org Cc: linux-wireless@vger.kernel.org, Malcolm Priestley , Subject: [PATCH 1/2] staging: vt6655: device_free_tx_buf use only ieee80211_tx_status_irqsafe Date: Thu, 9 Apr 2015 20:53:43 +0100 Message-Id: <1428609224-3237-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 TD_FLAGS_NETIF_SKB is only for data. Fixes issue of ack frames not being reported. Signed-off-by: Malcolm Priestley Cc: # v3.19+ --- drivers/staging/vt6655/device_main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 5b3de43..8f48c84 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -989,10 +989,8 @@ static void device_free_tx_buf(struct vnt_private *pDevice, PSTxDesc pDesc) skb->len, DMA_TO_DEVICE); } - if (pTDInfo->byFlags & TD_FLAGS_NETIF_SKB) + if (skb) ieee80211_tx_status_irqsafe(pDevice->hw, skb); - else - dev_kfree_skb_irq(skb); pTDInfo->skb_dma = 0; pTDInfo->skb = NULL;