From: Dave Watson Date: Mon, 22 Aug 2016 19:27:04 +0000 (-0700) Subject: net: strparser: fix strparser sk_user_data check X-Git-Tag: v4.9-rc1~127^2~408 X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=a01512dbe3ec1e7dc58b00161d61ead359f5ac08 net: strparser: fix strparser sk_user_data check sk_user_data mismatch between what kcm expects (psock) and what strparser expects (strparser). Queued rx_work, for example calling strp_check_rcv after socket buffer changes, will never complete. sk_user_data is unused in strparser, so just remove the check. Signed-off-by: Dave Watson Acked-by: Tom Herbert Signed-off-by: David S. Miller --- diff --git a/net/strparser/strparser.c b/net/strparser/strparser.c index fd688c0a7744..68334b56db1e 100644 --- a/net/strparser/strparser.c +++ b/net/strparser/strparser.c @@ -390,9 +390,6 @@ static void do_strp_rx_work(struct strparser *strp) */ lock_sock(csk); - if (unlikely(csk->sk_user_data != strp)) - goto out; - if (unlikely(strp->rx_stopped)) goto out;