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

Commit 4fa11ec7 authored by Sachin Kulkarni's avatar Sachin Kulkarni Committed by Johannes Berg
Browse files

mac80211: Requeue work after scan complete for all VIF types. 



During a sw scan ieee80211_iface_work ignores work items for all vifs.
However after the scan complete work is requeued only for STA, ADHOC
and MESH iftypes.

This occasionally results in event processing getting delayed/not
processed for iftype AP when it coexists with a STA. This can result
in data halt and eventually disconnection on the AP interface.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarSachin Kulkarni <Sachin.Kulkarni@imgtec.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent da629cf1

net/mac80211/ibss.c

+0 −1
Original line number Diff line number Diff line
@@ -1733,7 +1733,6 @@ void ieee80211_ibss_notify_scan_completed(struct ieee80211_local *local) 
		if (sdata->vif.type != NL80211_IFTYPE_ADHOC)

			continue;

		sdata->u.ibss.last_scan_completed = jiffies;

		ieee80211_queue_work(&local->hw, &sdata->work);

	}

	mutex_unlock(&local->iflist_mtx);

}

net/mac80211/mesh.c

+0 −11
Original line number Diff line number Diff line
@@ -1370,17 +1370,6 @@ void ieee80211_mesh_work(struct ieee80211_sub_if_data *sdata) 
	sdata_unlock(sdata);

}



void ieee80211_mesh_notify_scan_completed(struct ieee80211_local *local)

{

	struct ieee80211_sub_if_data *sdata;



	rcu_read_lock();

	list_for_each_entry_rcu(sdata, &local->interfaces, list)

		if (ieee80211_vif_is_mesh(&sdata->vif) &&

		    ieee80211_sdata_running(sdata))

			ieee80211_queue_work(&local->hw, &sdata->work);

	rcu_read_unlock();

}



void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata)

{

net/mac80211/mesh.h

+0 −4
Original line number Diff line number Diff line
@@ -362,14 +362,10 @@ static inline bool mesh_path_sel_is_hwmp(struct ieee80211_sub_if_data *sdata) 
	return sdata->u.mesh.mesh_pp_id == IEEE80211_PATH_PROTOCOL_HWMP;

}



void ieee80211_mesh_notify_scan_completed(struct ieee80211_local *local);



void mesh_path_flush_by_iface(struct ieee80211_sub_if_data *sdata);

void mesh_sync_adjust_tbtt(struct ieee80211_sub_if_data *sdata);

void ieee80211s_stop(void);

#else

static inline void

ieee80211_mesh_notify_scan_completed(struct ieee80211_local *local) {}

static inline bool mesh_path_sel_is_hwmp(struct ieee80211_sub_if_data *sdata)

{ return false; }

static inline void mesh_path_flush_by_iface(struct ieee80211_sub_if_data *sdata)

net/mac80211/mlme.c

+0 −2
Original line number Diff line number Diff line
@@ -4005,8 +4005,6 @@ static void ieee80211_restart_sta_timer(struct ieee80211_sub_if_data *sdata) 
		if (!ieee80211_hw_check(&sdata->local->hw, CONNECTION_MONITOR))

			ieee80211_queue_work(&sdata->local->hw,

					     &sdata->u.mgd.monitor_work);

		/* and do all the other regular work too */

		ieee80211_queue_work(&sdata->local->hw, &sdata->work);

	}

}

net/mac80211/scan.c

+11 −1
Original line number Diff line number Diff line
@@ -314,6 +314,7 @@ static void __ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted) 
	bool was_scanning = local->scanning;

	struct cfg80211_scan_request *scan_req;

	struct ieee80211_sub_if_data *scan_sdata;

	struct ieee80211_sub_if_data *sdata;



	lockdep_assert_held(&local->mtx);
@@ -373,7 +374,16 @@ static void __ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted) 


	ieee80211_mlme_notify_scan_completed(local);

	ieee80211_ibss_notify_scan_completed(local);

	ieee80211_mesh_notify_scan_completed(local);



	/* Requeue all the work that might have been ignored while

	 * the scan was in progress; if there was none this will

	 * just be a no-op for the particular interface.

	 */

	list_for_each_entry_rcu(sdata, &local->interfaces, list) {

		if (ieee80211_sdata_running(sdata))

			ieee80211_queue_work(&sdata->local->hw, &sdata->work);

	}



	if (was_scanning)

		ieee80211_start_next_roc(local);

}