Return-path: Received: from wolverine01.qualcomm.com ([199.106.114.254]:13876 "EHLO wolverine01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755989AbcCDPhd convert rfc822-to-8bit (ORCPT ); Fri, 4 Mar 2016 10:37:33 -0500 From: "Valo, Kalle" To: "michal.kazior@tieto.com" CC: "ath10k@lists.infradead.org" , "linux-wireless@vger.kernel.org" Subject: Re: [PATCH 10/13] ath10k: implement flushing of pending frames in txqs Date: Fri, 4 Mar 2016 15:37:28 +0000 Message-ID: <87twkmw8y5.fsf@kamboji.qca.qualcomm.com> (sfid-20160304_163737_033554_0C67A636) References: <1453384006-31907-1-git-send-email-michal.kazior@tieto.com> <1453384006-31907-11-git-send-email-michal.kazior@tieto.com> <87h9gmy538.fsf@kamboji.qca.qualcomm.com> In-Reply-To: (Michal Kazior's message of "Fri, 4 Mar 2016 10:52:04 +0100") Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org List-ID: Michal Kazior writes: > On 4 March 2016 at 10:17, Valo, Kalle wrote: >> Michal Kazior writes: >> >>> Firmware supporting pull-push tx model may request >>> a switch between modes. When switching from >>> pull-push to push-only it will be necessary to >>> flush all pending frames. The code will do that >>> once other bits that actually trigger it are added. >>> >>> Signed-off-by: Michal Kazior >> >> This fails to apply: >> >> fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath10k/htt_rx.c). >> Repository lacks necessary blobs to fall back on 3-way merge. >> Cannot fall back to three-way merge. >> Patch failed at 0010 ath10k: implement flushing of pending frames in txqs >> >>> @@ -2370,6 +2371,8 @@ static void ath10k_htt_txrx_compl_task(unsigned long ptr) >>> dev_kfree_skb_any(skb); >>> } >>> >>> + ath10k_mac_tx_push_pending(ar); >>> + >>> spin_lock_bh(&htt->rx_ring.lock); >>> while ((skb = __skb_dequeue(&htt->rx_compl_q))) { >>> resp = (struct htt_resp *)skb->data; >> >> This hunk seems to be the problem. I could try to fix it myself but the >> function has changed so I would prefer that you respin. > > This patch is in v1. It's base included some extra patches that > weren't in ath.git at the time. > > The v2 patchset has this patch squashed into wake_tx_queue patch and > the entire v2 patchset is based solely on ath.git without any extra > patches in between. Did patchwork confuse these patchsets? No, it was me who got confused :) I was accidentally applying v1 instead of v2. But v2 also has conflicts with ath-next. I need to first update my trees to get latest cfg80211/mac80211 and then I'll try again. -- Kalle Valo