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

Commit b100e5d6 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: avoid useless memory write on each frame RX 



In the likely case that probe_count is 0, don't write to the
memory there.

Also use ifmgd consistently in the function, instead of using
sdata->u.mgd as well.

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

net/mac80211/mlme.c

+4 −3
Original line number Diff line number Diff line
@@ -122,15 +122,16 @@ void ieee80211_sta_reset_conn_monitor(struct ieee80211_sub_if_data *sdata) 
{

	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;



	if (unlikely(!sdata->u.mgd.associated))

	if (unlikely(!ifmgd->associated))

		return;



	if (ifmgd->probe_send_count)

		ifmgd->probe_send_count = 0;



	if (ieee80211_hw_check(&sdata->local->hw, CONNECTION_MONITOR))

		return;



	mod_timer(&sdata->u.mgd.conn_mon_timer,

	mod_timer(&ifmgd->conn_mon_timer,

		  round_jiffies_up(jiffies + IEEE80211_CONNECTION_IDLE_TIME));

}