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

Commit 4ba4bc0f authored by Geliang Tang's avatar Geliang Tang Committed by Antonio Quartulli
Browse files

batman-adv: use to_delayed_work 



Use to_delayed_work() instead of open-coding it.

Signed-off-by: default avatarGeliang Tang <geliangtang@163.com>
Reviewed-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarMarek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: default avatarAntonio Quartulli <a@unstable.cc>
parent fb1f23ea

net/batman-adv/bridge_loop_avoidance.c

+1 −1
Original line number Diff line number Diff line
@@ -1303,7 +1303,7 @@ static void batadv_bla_periodic_work(struct work_struct *work) 
	struct batadv_hard_iface *primary_if;

	int i;



	delayed_work = container_of(work, struct delayed_work, work);

	delayed_work = to_delayed_work(work);

	priv_bla = container_of(delayed_work, struct batadv_priv_bla, work);

	bat_priv = container_of(priv_bla, struct batadv_priv, bla);

	primary_if = batadv_primary_if_get_selected(bat_priv);

net/batman-adv/distributed-arp-table.c

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static void batadv_dat_purge(struct work_struct *work) 
	struct batadv_priv_dat *priv_dat;

	struct batadv_priv *bat_priv;



	delayed_work = container_of(work, struct delayed_work, work);

	delayed_work = to_delayed_work(work);

	priv_dat = container_of(delayed_work, struct batadv_priv_dat, work);

	bat_priv = container_of(priv_dat, struct batadv_priv, dat);

net/batman-adv/network-coding.c

+1 −1
Original line number Diff line number Diff line
@@ -714,7 +714,7 @@ static void batadv_nc_worker(struct work_struct *work) 
	struct batadv_priv *bat_priv;

	unsigned long timeout;



	delayed_work = container_of(work, struct delayed_work, work);

	delayed_work = to_delayed_work(work);

	priv_nc = container_of(delayed_work, struct batadv_priv_nc, work);

	bat_priv = container_of(priv_nc, struct batadv_priv, nc);

net/batman-adv/originator.c

+1 −1
Original line number Diff line number Diff line
@@ -1222,7 +1222,7 @@ static void batadv_purge_orig(struct work_struct *work) 
	struct delayed_work *delayed_work;

	struct batadv_priv *bat_priv;



	delayed_work = container_of(work, struct delayed_work, work);

	delayed_work = to_delayed_work(work);

	bat_priv = container_of(delayed_work, struct batadv_priv, orig_work);

	_batadv_purge_orig(bat_priv);

	queue_delayed_work(batadv_event_workqueue,

net/batman-adv/send.c

+2 −2
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ static void batadv_send_outstanding_bcast_packet(struct work_struct *work) 
	struct net_device *soft_iface;

	struct batadv_priv *bat_priv;



	delayed_work = container_of(work, struct delayed_work, work);

	delayed_work = to_delayed_work(work);

	forw_packet = container_of(delayed_work, struct batadv_forw_packet,

				   delayed_work);

	soft_iface = forw_packet->if_incoming->soft_iface;
@@ -604,7 +604,7 @@ void batadv_send_outstanding_bat_ogm_packet(struct work_struct *work) 
	struct batadv_forw_packet *forw_packet;

	struct batadv_priv *bat_priv;



	delayed_work = container_of(work, struct delayed_work, work);

	delayed_work = to_delayed_work(work);

	forw_packet = container_of(delayed_work, struct batadv_forw_packet,

				   delayed_work);

	bat_priv = netdev_priv(forw_packet->if_incoming->soft_iface);