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

Commit 26d59535 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: clean up station cleanup timer 



We currently run this timer exactly once when
a new mac80211 device is registered, but that
is completely pointless since it will have no
work to do at all. Therefore, remove that and
also simplify some code using the timer.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ccc7c28a

net/mac80211/main.c

+0 −5
Original line number Diff line number Diff line
@@ -879,10 +879,6 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) 


	local->dynamic_ps_forced_timeout = -1;



	result = sta_info_start(local);

	if (result < 0)

		goto fail_sta_info;



	result = ieee80211_wep_init(local);

	if (result < 0)

		wiphy_debug(local->hw.wiphy, "Failed to initialize wep: %d\n",
@@ -945,7 +941,6 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) 
	rtnl_unlock();

	ieee80211_wep_free(local);

	sta_info_stop(local);

 fail_sta_info:

	destroy_workqueue(local->workqueue);

 fail_workqueue:

	wiphy_unregister(local->hw.wiphy);

net/mac80211/sta_info.c

+2 −11
Original line number Diff line number Diff line
@@ -768,9 +768,8 @@ static void sta_info_cleanup(unsigned long data) 
	if (!timer_needed)

		return;



	local->sta_cleanup.expires =

		round_jiffies(jiffies + STA_INFO_CLEANUP_INTERVAL);

	add_timer(&local->sta_cleanup);

	mod_timer(&local->sta_cleanup,

		  round_jiffies(jiffies + STA_INFO_CLEANUP_INTERVAL));

}



void sta_info_init(struct ieee80211_local *local)
@@ -783,14 +782,6 @@ void sta_info_init(struct ieee80211_local *local) 


	setup_timer(&local->sta_cleanup, sta_info_cleanup,

		    (unsigned long)local);

	local->sta_cleanup.expires =

		round_jiffies(jiffies + STA_INFO_CLEANUP_INTERVAL);

}



int sta_info_start(struct ieee80211_local *local)

{

	add_timer(&local->sta_cleanup);

	return 0;

}



void sta_info_stop(struct ieee80211_local *local)

net/mac80211/sta_info.h

+0 −1
Original line number Diff line number Diff line
@@ -497,7 +497,6 @@ void sta_info_set_tim_bit(struct sta_info *sta); 
void sta_info_clear_tim_bit(struct sta_info *sta);



void sta_info_init(struct ieee80211_local *local);

int sta_info_start(struct ieee80211_local *local);

void sta_info_stop(struct ieee80211_local *local);

int sta_info_flush(struct ieee80211_local *local,

		   struct ieee80211_sub_if_data *sdata);

net/mac80211/util.c

+1 −1
Original line number Diff line number Diff line
@@ -1290,7 +1290,7 @@ int ieee80211_reconfig(struct ieee80211_local *local) 
		}

	}



	add_timer(&local->sta_cleanup);

	mod_timer(&local->sta_cleanup, jiffies + 1);



	mutex_lock(&local->sta_mtx);

	list_for_each_entry(sta, &local->sta_list, list)