Message ID | 20201006063201.294959-5-allen.lkml@gmail.com |
---|---|
State | New |
Headers | show |
Series | net: convert tasklets to use new | expand |
Hello. On 06.10.20 08:31, Allen Pais wrote: > 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 <apais@linux.microsoft.com> > --- > net/mac802154/main.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/net/mac802154/main.c b/net/mac802154/main.c > index 06ea0f8bf..520cedc59 100644 > --- a/net/mac802154/main.c > +++ b/net/mac802154/main.c > @@ -20,9 +20,9 @@ > #include "ieee802154_i.h" > #include "cfg.h" > > -static void ieee802154_tasklet_handler(unsigned long data) > +static void ieee802154_tasklet_handler(struct tasklet_struct *t) > { > - struct ieee802154_local *local = (struct ieee802154_local *)data; > + struct ieee802154_local *local = from_tasklet(local, t, tasklet); > struct sk_buff *skb; > > while ((skb = skb_dequeue(&local->skb_queue))) { > @@ -91,9 +91,7 @@ ieee802154_alloc_hw(size_t priv_data_len, const struct ieee802154_ops *ops) > INIT_LIST_HEAD(&local->interfaces); > mutex_init(&local->iflist_mtx); > > - tasklet_init(&local->tasklet, > - ieee802154_tasklet_handler, > - (unsigned long)local); > + tasklet_setup(&local->tasklet, ieee802154_tasklet_handler); > > skb_queue_head_init(&local->skb_queue); > > Acked-by: Stefan Schmidt <stefan@datenfreihafen.org> regards Stefan Schmidt
diff --git a/net/mac802154/main.c b/net/mac802154/main.c index 06ea0f8bf..520cedc59 100644 --- a/net/mac802154/main.c +++ b/net/mac802154/main.c @@ -20,9 +20,9 @@ #include "ieee802154_i.h" #include "cfg.h" -static void ieee802154_tasklet_handler(unsigned long data) +static void ieee802154_tasklet_handler(struct tasklet_struct *t) { - struct ieee802154_local *local = (struct ieee802154_local *)data; + struct ieee802154_local *local = from_tasklet(local, t, tasklet); struct sk_buff *skb; while ((skb = skb_dequeue(&local->skb_queue))) { @@ -91,9 +91,7 @@ ieee802154_alloc_hw(size_t priv_data_len, const struct ieee802154_ops *ops) INIT_LIST_HEAD(&local->interfaces); mutex_init(&local->iflist_mtx); - tasklet_init(&local->tasklet, - ieee802154_tasklet_handler, - (unsigned long)local); + tasklet_setup(&local->tasklet, ieee802154_tasklet_handler); skb_queue_head_init(&local->skb_queue);