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

Commit 6e70d560 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

iwlwifi: dvm: don't sleep in event_callback callback 



This will allow mac80211 to forbid sleeping from the
event_callback callback.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent c1041f10

drivers/net/wireless/iwlwifi/dvm/mac80211.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -1140,7 +1140,6 @@ static void iwlagn_mac_event_callback(struct ieee80211_hw *hw, 
		return;

		return;





	IWL_DEBUG_MAC80211(priv, "enter\n");

	IWL_DEBUG_MAC80211(priv, "enter\n");

	mutex_lock(&priv->mutex);





	if (priv->lib->bt_params &&

	if (priv->lib->bt_params &&

	    priv->lib->bt_params->advanced_bt_coexist) {

	    priv->lib->bt_params->advanced_bt_coexist) {
@@ -1149,13 +1148,12 @@ static void iwlagn_mac_event_callback(struct ieee80211_hw *hw, 
		else if (event->u.rssi.data == RSSI_EVENT_HIGH)

		else if (event->u.rssi.data == RSSI_EVENT_HIGH)

			priv->bt_enable_pspoll = false;

			priv->bt_enable_pspoll = false;





		iwlagn_send_advance_bt_config(priv);

		queue_work(priv->workqueue, &priv->bt_runtime_config);

	} else {

	} else {

		IWL_DEBUG_MAC80211(priv, "Advanced BT coex disabled,"

		IWL_DEBUG_MAC80211(priv, "Advanced BT coex disabled,"

				"ignoring RSSI callback\n");

				"ignoring RSSI callback\n");

	}

	}





	mutex_unlock(&priv->mutex);

	IWL_DEBUG_MAC80211(priv, "leave\n");

	IWL_DEBUG_MAC80211(priv, "leave\n");

}

}