summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTom Herbert <tom@quantonium.net>2017-10-20 16:40:43 -0700
committerDavid S. Miller <davem@davemloft.net>2017-10-25 10:37:11 +0900
commit829385f08ae99740276cbd46c9db29764c519211 (patch)
treea95d023c7d12186bd605660c93841df05086e65c /include
parent864f5af3a3525f588391cd230cb8129ad758708e (diff)
downloadlinux-829385f08ae99740276cbd46c9db29764c519211.tar.bz2
strparser: Use delayed work instead of timer for msg timeout
Sock lock may be taken in the message timer function which is a problem since timers run in BH. Instead of timers use delayed_work. Reported-by: Eric Dumazet <eric.dumazet@gmail.com> Fixes: bbb03029a899 ("strparser: Generalize strparser") Signed-off-by: Tom Herbert <tom@quantonium.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/net/strparser.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/net/strparser.h b/include/net/strparser.h
index 7dc131d62ad5..d96b59f45eba 100644
--- a/include/net/strparser.h
+++ b/include/net/strparser.h
@@ -74,10 +74,9 @@ struct strparser {
u32 unrecov_intr : 1;
struct sk_buff **skb_nextp;
- struct timer_list msg_timer;
struct sk_buff *skb_head;
unsigned int need_bytes;
- struct delayed_work delayed_work;
+ struct delayed_work msg_timer_work;
struct work_struct work;
struct strp_stats stats;
struct strp_callbacks cb;