Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afd0922e authored by Michal Kazior's avatar Michal Kazior Committed by Kalle Valo
Browse files

ath10k: prevent starting monitor without a vdev 



This fixes issue with interface bridging.

Linux bridging sets promiscuous mode for all
interfaces that are in a bridge. This translates
to configure_filter() being called in a mac80211
driver.

Before the patch operational interface would be
started and upped again when promiscuous mode was
enabled causing all sorts of strange issues:

 * no HTT RX happening (i.e. no traffic)
 * FW crash upon driver reload/unload

Signed-off-by: default avatarMichal Kazior <michal.kazior@tieto.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent a1b13b9a

drivers/net/wireless/ath/ath10k/mac.c

+8 −2
Original line number Diff line number Diff line
@@ -2265,8 +2265,14 @@ static void ath10k_configure_filter(struct ieee80211_hw *hw, 
	*total_flags &= SUPPORTED_FILTERS;

	ar->filter_flags = *total_flags;



	/* Monitor must not be started if it wasn't created first.

	 * Promiscuous mode may be started on a non-monitor interface - in

	 * such case the monitor vdev is not created so starting the

	 * monitor makes no sense. Since ath10k uses no special RX filters

	 * (only BSS filter in STA mode) there's no need for any special

	 * action here. */

	if ((ar->filter_flags & FIF_PROMISC_IN_BSS) &&

	    !ar->monitor_enabled) {

	    !ar->monitor_enabled && ar->monitor_present) {

		ath10k_dbg(ATH10K_DBG_MAC, "mac monitor %d start\n",

			   ar->monitor_vdev_id);
@@ -2274,7 +2280,7 @@ static void ath10k_configure_filter(struct ieee80211_hw *hw, 
		if (ret)

			ath10k_warn("Unable to start monitor mode\n");

	} else if (!(ar->filter_flags & FIF_PROMISC_IN_BSS) &&

		   ar->monitor_enabled) {

		   ar->monitor_enabled && ar->monitor_present) {

		ath10k_dbg(ATH10K_DBG_MAC, "mac monitor %d stop\n",

			   ar->monitor_vdev_id);