Adding John as this involved wireless-testing Michal Kazior <michal.kazior@xxxxxxxxx> writes: > On 12 May 2015 at 14:45, Michal Kazior <michal.kazior@xxxxxxxxx> 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 <michal.kazior@xxxxxxxxx> > > 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. -- Kalle Valo -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html