diff options
| author |   Taehee Yoo <ap420073@gmail.com> | 2021-03-25 16:16:51 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-03-26 15:14:55 -0700 |
| commit | 2d9a93b4902be6a5504b5941dd15e9cd776aadca (patch) | |
| tree | f42268e932b00dc8c90f929cbbd7ae03f82824fc /include/net/if_inet6.h | |
| parent | Merge branch 'ethtool-kdoc-touchups' (diff) | |
| download | wireguard-linux-2d9a93b4902be6a5504b5941dd15e9cd776aadca.tar.xz wireguard-linux-2d9a93b4902be6a5504b5941dd15e9cd776aadca.zip | |
mld: convert from timer to delayed work
mcast.c has several timers for delaying works.
Timer's expire handler is working under atomic context so it can't use
sleepable things such as GFP_KERNEL, mutex, etc.
In order to use sleepable APIs, it converts from timers to delayed work.
But there are some critical sections, which is used by both process
and BH context. So that it still uses spin_lock_bh() and rwlock.
Suggested-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: Taehee Yoo <ap420073@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/if_inet6.h')
| -rw-r--r-- | include/net/if_inet6.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h index 8bf5906073bc..af5244c9ca5c 100644 --- a/include/net/if_inet6.h +++ b/include/net/if_inet6.h @@ -120,7 +120,7 @@ struct ifmcaddr6 { unsigned int mca_sfmode; unsigned char mca_crcount; unsigned long mca_sfcount[2]; - struct timer_list mca_timer; + struct delayed_work mca_work; unsigned int mca_flags; int mca_users; refcount_t mca_refcnt; @@ -179,9 +179,9 @@ struct inet6_dev { unsigned long mc_qri; /* Query Response Interval */ unsigned long mc_maxdelay; - struct timer_list mc_gq_timer; /* general query timer */ - struct timer_list mc_ifc_timer; /* interface change timer */ - struct timer_list mc_dad_timer; /* dad complete mc timer */ + struct delayed_work mc_gq_work; /* general query work */ + struct delayed_work mc_ifc_work; /* interface change work */ + struct delayed_work mc_dad_work; /* dad complete mc work */ struct ifacaddr6 *ac_list; rwlock_t lock; |