From patchwork Tue Sep 27 13:04:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mohammed Shafi Shajakhan X-Patchwork-Id: 9351835 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BE97C6077A for ; Tue, 27 Sep 2016 13:04:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AFF78291E5 for ; Tue, 27 Sep 2016 13:04:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A45EB291F4; Tue, 27 Sep 2016 13:04:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 47CC9291E5 for ; Tue, 27 Sep 2016 13:04:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753240AbcI0NEw (ORCPT ); Tue, 27 Sep 2016 09:04:52 -0400 Received: from wolverine01.qualcomm.com ([199.106.114.254]:49707 "EHLO wolverine01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751631AbcI0NEu (ORCPT ); Tue, 27 Sep 2016 09:04:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qti.qualcomm.com; i=@qti.qualcomm.com; q=dns/txt; s=qcdkim; t=1474981490; x=1506517490; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=xdJ0L5oM13WQDf1DLMmOC6PezQeNS2GdhBxA8wlXejY=; b=F2fxrZpFRR5aC8uDY+T9gi/Npsp9U+PimPxHo0Lr/sEISyvJU9ebVK2I mhftj1juhsW4Z+2SHx4LWRpgjQaqf0bTB2DdksXPxnvwmPo9d+/pJ2iyA GOQ2KVk7EesrFSo8RZt/9bzBVk1KDFEbf+/OnLrPizfghX3rT4VNp9Dkq Y=; X-IronPort-AV: E=Sophos;i="5.30,405,1470726000"; d="scan'208";a="227460478" Received: from unknown (HELO Ironmsg03-L.qualcomm.com) ([10.53.140.110]) by wolverine01.qualcomm.com with ESMTP; 27 Sep 2016 06:04:50 -0700 X-IronPort-AV: E=McAfee;i="5700,7163,8300"; a="1230582948" Received: from nasanexm01e.na.qualcomm.com ([10.85.0.31]) by Ironmsg03-L.qualcomm.com with ESMTP/TLS/RC4-SHA; 27 Sep 2016 06:04:50 -0700 Received: from aphydexm01f.ap.qualcomm.com (10.252.127.15) by NASANEXM01E.na.qualcomm.com (10.85.0.31) with Microsoft SMTP Server (TLS) id 15.0.1178.4; Tue, 27 Sep 2016 06:04:49 -0700 Received: from aphydexm01b.ap.qualcomm.com (10.252.127.11) by aphydexm01f.ap.qualcomm.com (10.252.127.15) with Microsoft SMTP Server (TLS) id 15.0.1178.4; Tue, 27 Sep 2016 18:34:44 +0530 Received: from aphydexm01b.ap.qualcomm.com ([10.252.127.11]) by aphydexm01b.ap.qualcomm.com ([10.252.127.11]) with mapi id 15.00.1178.000; Tue, 27 Sep 2016 18:34:44 +0530 From: "Shajakhan, Mohammed Shafi (Mohammed Shafi)" To: "ath10k@lists.infradead.org" CC: "mohammed@codeaurora.org" , "linux-wireless@vger.kernel.org" Subject: Re: [PATCH v4] ath10k: Cleanup calling ath10k_htt_rx_h_unchain Thread-Topic: [PATCH v4] ath10k: Cleanup calling ath10k_htt_rx_h_unchain Thread-Index: AQHSGL9GpnLdfBZRJk6tKmZK7smKE6CNTc35 Date: Tue, 27 Sep 2016 13:04:44 +0000 Message-ID: <1474981503694.62077@qti.qualcomm.com> References: <1474981300-15945-1-git-send-email-mohammed@qca.qualcomm.com> In-Reply-To: <1474981300-15945-1-git-send-email-mohammed@qca.qualcomm.com> Accept-Language: en-IN, en-US Content-Language: en-IN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [199.106.107.6] MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP apologies please ignore this , wrong patch due to confusing v4 tag please review, [PATCH] ath10k: Cleanup calling ath10k_htt_rx_h_unchain diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c index 7ae9349..e51dace 100644 --- a/drivers/net/wireless/ath/ath10k/htt_rx.c +++ b/drivers/net/wireless/ath/ath10k/htt_rx.c @@ -1459,8 +1459,7 @@ static int ath10k_unchain_msdu(struct sk_buff_head *amsdu) } static void ath10k_htt_rx_h_unchain(struct ath10k *ar, - struct sk_buff_head *amsdu, - bool chained) + struct sk_buff_head *amsdu) { struct sk_buff *first; struct htt_rx_desc *rxd; @@ -1471,9 +1470,6 @@ static void ath10k_htt_rx_h_unchain(struct ath10k *ar, decap = MS(__le32_to_cpu(rxd->msdu_start.common.info1), RX_MSDU_START_INFO1_DECAP_FORMAT); - if (!chained) - return; - /* FIXME: Current unchaining logic can only handle simple case of raw * msdu chaining. If decapping is other than raw the chaining may be * more complex and this isn't handled by the current code. Don't even @@ -1550,7 +1546,11 @@ static int ath10k_htt_rx_handle_amsdu(struct ath10k_htt *htt) } ath10k_htt_rx_h_ppdu(ar, &amsdu, rx_status, 0xffff); - ath10k_htt_rx_h_unchain(ar, &amsdu, ret > 0); + + /* only for ret = 1 indicates chained msdus */ + if (ret > 0) + ath10k_htt_rx_h_unchain(ar, &amsdu); + ath10k_htt_rx_h_filter(ar, &amsdu, rx_status); ath10k_htt_rx_h_mpdu(ar, &amsdu, rx_status); ath10k_htt_rx_h_deliver(ar, &amsdu, rx_status);