Return-path: Received: from sabertooth02.qualcomm.com ([65.197.215.38]:39280 "EHLO sabertooth02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751924AbbEYMZM (ORCPT ); Mon, 25 May 2015 08:25:12 -0400 From: Kalle Valo To: Michal Kazior CC: "John W. Linville" , "ath10k@lists.infradead.org" , linux-wireless Subject: Re: [PATCH] amth10k: fix promisc handling References: <1431434736-7077-1-git-send-email-michal.kazior@tieto.com> <874mn68jl7.fsf@kamboji.qca.qualcomm.com> Date: Mon, 25 May 2015 15:25:03 +0300 In-Reply-To: <874mn68jl7.fsf@kamboji.qca.qualcomm.com> (Kalle Valo's message of "Thu, 21 May 2015 10:40:04 +0300") Message-ID: <87oal83kv4.fsf@kamboji.qca.qualcomm.com> (sfid-20150525_142516_894390_F30DEFE6) MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Sender: linux-wireless-owner@vger.kernel.org List-ID: Kalle Valo writes: > Adding John as this involved wireless-testing > > Michal Kazior writes: > >> On 12 May 2015 at 14:45, Michal Kazior wrote: >>> Patch df1404650ccb ("mac80211: remove support for >>> IFF_PROMISC") removed promiscuous flag propagation >>> to drivers. >>> >>> However the patch was designed against ath10k >>> without 548462133d98 ("ath10k: fix interrupt >>> storm"). >>> >>> After merge the code drifted into being no longer >>> correct and due to monitor vdev being >>> overzealously started caused IBSS to crash on >>> 999.999.0.636 for QCA988X (this firmware revision >>> is known to have issues with monitor vdev). >>> >>> This patch keeps expectations of commit >>> 548462133d98 (i.e. reduce irq storm by not >>> enabling monitor vdev for AP) and doesn't break >>> existing (known) setups that imply promiscuous >>> mode on network interfaces. >>> >>> Contrary to what it looks like 548462133d98 >>> functionality is not reverted since the intention >>> was a subset of what df1404650ccb did. >>> >>> Fixes: c17c997d5613 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next") >>> Signed-off-by: Michal Kazior >> >> Apparently this also fixes some weird issues with qca6174 hw2.1 notably: >> - ath10k causing disconnecting of other devices in a BSS >> - random Fw crashes >> >> Both problems started to happen because c17c997d5613 enabled monitor >> vdev by default on STA interfaces. It seems that qca6174 hw2.1 >> firmware has issues similar to those of qca988x 999.999.0.636 >> regarding monitor vdev opration. >> >> Also, I've made a typo in the subject. >> >> I'll post v2 with subject fixed and extended commit log later. > > Keep in mind that c17c997d5613 is actually from wireless-testing.git > which means that it will never go to wireless-drivers-next.git nor to > net-next.git. So the merge conflict bug is purely in > wireless-testing.git and in master branch of ath.git (but not in > ath-next branch!). > > I think John should apply your v2 patch once you send it. But if you > have something which should be fixed in ath-next remember to send that > in a separate patch so that I can apply that directly to ath-next. Actually now that Dave pulled my pull request the issue is fixed in wireless-drivers-next already. So once John pulls from wireless-drivers-next and makes sure that ath10k is 100% identical in both trees the issue should be sorted out and no need for extra patches. -- Kalle Valo