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

Commit 34f11cd3 authored by Kees Cook's avatar Kees Cook Committed by Johannes Berg
Browse files

mac80211: Convert timers to use timer_setup() 



In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: linux-wireless@vger.kernel.org
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 32a72bbd

net/mac80211/ibss.c

+3 −4
Original line number Diff line number Diff line
@@ -1711,10 +1711,10 @@ void ieee80211_ibss_work(struct ieee80211_sub_if_data *sdata) 
	sdata_unlock(sdata);

}



static void ieee80211_ibss_timer(unsigned long data)

static void ieee80211_ibss_timer(struct timer_list *t)

{

	struct ieee80211_sub_if_data *sdata =

		(struct ieee80211_sub_if_data *) data;

		from_timer(sdata, t, u.ibss.timer);



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

}
@@ -1723,8 +1723,7 @@ void ieee80211_ibss_setup_sdata(struct ieee80211_sub_if_data *sdata) 
{

	struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;



	setup_timer(&ifibss->timer, ieee80211_ibss_timer,

		    (unsigned long) sdata);

	timer_setup(&ifibss->timer, ieee80211_ibss_timer, 0);

	INIT_LIST_HEAD(&ifibss->incomplete_stations);

	spin_lock_init(&ifibss->incomplete_lock);

	INIT_WORK(&ifibss->csa_connection_drop_work,

net/mac80211/ieee80211_i.h

+2 −1
Original line number Diff line number Diff line
@@ -1057,6 +1057,7 @@ struct tpt_led_trigger { 
	const struct ieee80211_tpt_blink *blink_table;

	unsigned int blink_table_len;

	struct timer_list timer;

	struct ieee80211_local *local;

	unsigned long prev_traffic;

	unsigned long tx_bytes, rx_bytes;

	unsigned int active, want;
@@ -1932,7 +1933,7 @@ static inline int ieee80211_ac_from_tid(int tid) 


void ieee80211_dynamic_ps_enable_work(struct work_struct *work);

void ieee80211_dynamic_ps_disable_work(struct work_struct *work);

void ieee80211_dynamic_ps_timer(unsigned long data);

void ieee80211_dynamic_ps_timer(struct timer_list *t);

void ieee80211_send_nullfunc(struct ieee80211_local *local,

			     struct ieee80211_sub_if_data *sdata,

			     bool powersave);

net/mac80211/led.c

+6 −5
Original line number Diff line number Diff line
@@ -248,10 +248,10 @@ static unsigned long tpt_trig_traffic(struct ieee80211_local *local, 
	return DIV_ROUND_UP(delta, 1024 / 8);

}



static void tpt_trig_timer(unsigned long data)

static void tpt_trig_timer(struct timer_list *t)

{

	struct ieee80211_local *local = (void *)data;

	struct tpt_led_trigger *tpt_trig = local->tpt_led_trigger;

	struct tpt_led_trigger *tpt_trig = from_timer(tpt_trig, t, timer);

	struct ieee80211_local *local = tpt_trig->local;

	struct led_classdev *led_cdev;

	unsigned long on, off, tpt;

	int i;
@@ -306,8 +306,9 @@ __ieee80211_create_tpt_led_trigger(struct ieee80211_hw *hw, 
	tpt_trig->blink_table = blink_table;

	tpt_trig->blink_table_len = blink_table_len;

	tpt_trig->want = flags;

	tpt_trig->local = local;



	setup_timer(&tpt_trig->timer, tpt_trig_timer, (unsigned long)local);

	timer_setup(&tpt_trig->timer, tpt_trig_timer, 0);



	local->tpt_led_trigger = tpt_trig;
@@ -326,7 +327,7 @@ static void ieee80211_start_tpt_led_trig(struct ieee80211_local *local) 
	tpt_trig_traffic(local, tpt_trig);

	tpt_trig->running = true;



	tpt_trig_timer((unsigned long)local);

	tpt_trig_timer(&tpt_trig->timer);

	mod_timer(&tpt_trig->timer, round_jiffies(jiffies + HZ));

}

net/mac80211/main.c

+1 −2
Original line number Diff line number Diff line
@@ -633,8 +633,7 @@ struct ieee80211_hw *ieee80211_alloc_hw_nm(size_t priv_data_len, 
		  ieee80211_dynamic_ps_enable_work);

	INIT_WORK(&local->dynamic_ps_disable_work,

		  ieee80211_dynamic_ps_disable_work);

	setup_timer(&local->dynamic_ps_timer,

		    ieee80211_dynamic_ps_timer, (unsigned long) local);

	timer_setup(&local->dynamic_ps_timer, ieee80211_dynamic_ps_timer, 0);



	INIT_WORK(&local->sched_scan_stopped_work,

		  ieee80211_sched_scan_stopped_work);

net/mac80211/mesh.c

+12 −15
Original line number Diff line number Diff line
@@ -37,9 +37,10 @@ void ieee80211s_stop(void) 
	kmem_cache_destroy(rm_cache);

}



static void ieee80211_mesh_housekeeping_timer(unsigned long data)

static void ieee80211_mesh_housekeeping_timer(struct timer_list *t)

{

	struct ieee80211_sub_if_data *sdata = (void *) data;

	struct ieee80211_sub_if_data *sdata =

		from_timer(sdata, t, u.mesh.housekeeping_timer);

	struct ieee80211_local *local = sdata->local;

	struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
@@ -528,18 +529,18 @@ int mesh_add_vht_oper_ie(struct ieee80211_sub_if_data *sdata, 
	return 0;

}



static void ieee80211_mesh_path_timer(unsigned long data)

static void ieee80211_mesh_path_timer(struct timer_list *t)

{

	struct ieee80211_sub_if_data *sdata =

		(struct ieee80211_sub_if_data *) data;

		from_timer(sdata, t, u.mesh.mesh_path_timer);



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

}



static void ieee80211_mesh_path_root_timer(unsigned long data)

static void ieee80211_mesh_path_root_timer(struct timer_list *t)

{

	struct ieee80211_sub_if_data *sdata =

		(struct ieee80211_sub_if_data *) data;

		from_timer(sdata, t, u.mesh.mesh_path_root_timer);

	struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;



	set_bit(MESH_WORK_ROOT, &ifmsh->wrkq_flags);
@@ -1442,9 +1443,8 @@ void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata) 
	struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;

	static u8 zero_addr[ETH_ALEN] = {};



	setup_timer(&ifmsh->housekeeping_timer,

		    ieee80211_mesh_housekeeping_timer,

		    (unsigned long) sdata);

	timer_setup(&ifmsh->housekeeping_timer,

		    ieee80211_mesh_housekeeping_timer, 0);



	ifmsh->accepting_plinks = true;

	atomic_set(&ifmsh->mpaths, 0);
@@ -1458,12 +1458,9 @@ void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata) 


	mesh_pathtbl_init(sdata);



	setup_timer(&ifmsh->mesh_path_timer,

		    ieee80211_mesh_path_timer,

		    (unsigned long) sdata);

	setup_timer(&ifmsh->mesh_path_root_timer,

		    ieee80211_mesh_path_root_timer,

		    (unsigned long) sdata);

	timer_setup(&ifmsh->mesh_path_timer, ieee80211_mesh_path_timer, 0);

	timer_setup(&ifmsh->mesh_path_root_timer,

		    ieee80211_mesh_path_root_timer, 0);

	INIT_LIST_HEAD(&ifmsh->preq_queue.list);

	skb_queue_head_init(&ifmsh->ps.bc_buf);

	spin_lock_init(&ifmsh->mesh_preq_queue_lock);