Linux-WPAN Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH 1/8] net: dccp: convert tasklets to use new tasklet_setup() API
@ 2020-08-17  8:51 Allen Pais
  2020-08-17  8:51 ` [PATCH 2/8] net: ipv4: " Allen Pais
                   ` (6 more replies)
  0 siblings, 7 replies; 10+ messages in thread
From: Allen Pais @ 2020-08-17  8:51 UTC (permalink / raw)
  To: gerrit, davem, kuba, edumazet, kuznet, yoshfuji, johannes,
	alex.aring, stefan, santosh.shilimkar, jhs, xiyou.wangcong, jiri
  Cc: keescook, netdev, linux-wireless, linux-kernel, linux-wpan,
	linux-rdma, linux-s390, Allen Pais, Romain Perier

From: Allen Pais <allen.lkml@gmail.com>

In preparation for unconditionally passing the
struct tasklet_struct pointer to all tasklet
callbacks, switch to using the new tasklet_setup()
and from_tasklet() to pass the tasklet pointer explicitly.

Signed-off-by: Romain Perier <romain.perier@gmail.com>
Signed-off-by: Allen Pais <allen.lkml@gmail.com>
---
 net/dccp/timer.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/net/dccp/timer.c b/net/dccp/timer.c
index 0e06dfc32273..f174ecb2fb4e 100644
--- a/net/dccp/timer.c
+++ b/net/dccp/timer.c
@@ -220,9 +220,10 @@ static void dccp_delack_timer(struct timer_list *t)
  *
  * See the comments above %ccid_dequeueing_decision for supported modes.
  */
-static void dccp_write_xmitlet(unsigned long data)
+static void dccp_write_xmitlet(struct tasklet_struct *t)
 {
-	struct sock *sk = (struct sock *)data;
+	struct dccp_sock *dp = from_tasklet(dp, t, dccps_xmitlet);
+	struct sock *sk = &dp->dccps_inet_connection.icsk_inet.sk;
 
 	bh_lock_sock(sk);
 	if (sock_owned_by_user(sk))
@@ -236,16 +237,15 @@ static void dccp_write_xmitlet(unsigned long data)
 static void dccp_write_xmit_timer(struct timer_list *t)
 {
 	struct dccp_sock *dp = from_timer(dp, t, dccps_xmit_timer);
-	struct sock *sk = &dp->dccps_inet_connection.icsk_inet.sk;
 
-	dccp_write_xmitlet((unsigned long)sk);
+	dccp_write_xmitlet(&dp->dccps_xmitlet);
 }
 
 void dccp_init_xmit_timers(struct sock *sk)
 {
 	struct dccp_sock *dp = dccp_sk(sk);
 
-	tasklet_init(&dp->dccps_xmitlet, dccp_write_xmitlet, (unsigned long)sk);
+	tasklet_setup(&dp->dccps_xmitlet, dccp_write_xmitlet);
 	timer_setup(&dp->dccps_xmit_timer, dccp_write_xmit_timer, 0);
 	inet_csk_init_xmit_timers(sk, &dccp_write_timer, &dccp_delack_timer,
 				  &dccp_keepalive_timer);
-- 
2.17.1


^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, back to index

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-17  8:51 [PATCH 1/8] net: dccp: convert tasklets to use new tasklet_setup() API Allen Pais
2020-08-17  8:51 ` [PATCH 2/8] net: ipv4: " Allen Pais
2020-08-17  8:51 ` [PATCH 3/8] net: mac80211: " Allen Pais
2020-08-17  8:56   ` Johannes Berg
2020-08-17  8:51 ` [PATCH 4/8] net: mac802154: " Allen Pais
2020-08-17 12:19   ` Stefan Schmidt
2020-08-17  8:51 ` [PATCH 5/8] net: rds: " Allen Pais
2020-08-17  8:51 ` [PATCH 6/8] net: sched: " Allen Pais
2020-08-17  8:51 ` [PATCH 7/8] net: smc: " Allen Pais
2020-08-17  8:51 ` [PATCH 8/8] net: xfrm: " Allen Pais

Linux-WPAN Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-wpan/0 linux-wpan/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-wpan linux-wpan/ https://lore.kernel.org/linux-wpan \
		linux-wpan@vger.kernel.org
	public-inbox-index linux-wpan

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-wpan


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git