From patchwork Fri Jun 5 14:01:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taehee Yoo X-Patchwork-Id: 6553951 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 3F030C0020 for ; Fri, 5 Jun 2015 14:02:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 68C0E2051F for ; Fri, 5 Jun 2015 14:02:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AC02420551 for ; Fri, 5 Jun 2015 14:02:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752494AbbFEOB5 (ORCPT ); Fri, 5 Jun 2015 10:01:57 -0400 Received: from mail-pd0-f177.google.com ([209.85.192.177]:34203 "EHLO mail-pd0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422727AbbFEOBz (ORCPT ); Fri, 5 Jun 2015 10:01:55 -0400 Received: by pdbki1 with SMTP id ki1so54128782pdb.1 for ; Fri, 05 Jun 2015 07:01:54 -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:in-reply-to:references; bh=sUujptR5OoKUMKiON1NXfN3U/QlU/crkDf/84Q6mc8k=; b=rN/YAkCPVJhBDDeSSvhm87zB49GIaGogtMDXdP4kC+aMFcRHmRYylKXHrGOy5nSOSP pFfSGY6ufUWwwHzX75iNMlBTy8o75khe97EavrO7oMjS0PGpZgcOMT8QphAB9JJCovZn QrME8iXHMKSiQZctE7syxyqHj6r1OFVJfyEj1JaSu4UUdkrLSyDGrNTgJLfaHwL32hG3 fEhRdanOqBoWzCUz71W4G26jcMXnSsnRbmngiZyKoPSSisstfIRGu+dRmqdwjI0r/dfu R6TYDAsIVc8wL7oS7yJlT6R742r7vjQuyRz6+ps998FyZJf098jbsoskAjrom163c94j dv+Q== X-Received: by 10.69.19.129 with SMTP id gu1mr6382676pbd.162.1433512914824; Fri, 05 Jun 2015 07:01:54 -0700 (PDT) Received: from localhost.localdomain ([112.153.155.138]) by mx.google.com with ESMTPSA id a10sm6908838pbu.15.2015.06.05.07.01.52 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 05 Jun 2015 07:01:53 -0700 (PDT) From: Taehee Yoo To: Larry.Finger@lwfinger.net Cc: ap420073@gmail.com, linux-wireless@vger.kernel.org Subject: [PATCH 3/3] rtlwifi: rtl8192cu: Fix variable isfirst_ampdu Date: Fri, 5 Jun 2015 23:01:38 +0900 Message-Id: <1433512898-30137-3-git-send-email-ap420073@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1433512898-30137-1-git-send-email-ap420073@gmail.com> References: <1433512898-30137-1-git-send-email-ap420073@gmail.com> 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 rtl92cu_rx_query_desc set a isampdu twice. but second code is related to isfirst_ampdu. so i change it. Signed-off-by: Taehee Yoo Acked-by: Larry Finger --- drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c index cbead00..95880fe 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c +++ b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c @@ -321,7 +321,7 @@ bool rtl92cu_rx_query_desc(struct ieee80211_hw *hw, stats->rate = (u8) GET_RX_DESC_RX_MCS(pdesc); stats->shortpreamble = (u16) GET_RX_DESC_SPLCP(pdesc); stats->isampdu = (bool) (GET_RX_DESC_PAGGR(pdesc) == 1); - stats->isampdu = (bool) ((GET_RX_DESC_PAGGR(pdesc) == 1) + stats->isfirst_ampdu = (bool)((GET_RX_DESC_PAGGR(pdesc) == 1) && (GET_RX_DESC_FAGGR(pdesc) == 1)); stats->timestamp_low = GET_RX_DESC_TSFL(pdesc); stats->rx_is40Mhzpacket = (bool) GET_RX_DESC_BW(pdesc);