diff options
| author | Dave Watson <[email protected]> | 2016-08-22 19:27:04 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2016-08-23 05:43:16 +0000 |
| commit | a01512dbe3ec1e7dc58b00161d61ead359f5ac08 (patch) | |
| tree | e67a875f3f1c314d822dd80d49888b81da1f5ad2 /net/strparser/strparser.c | |
| parent | qed: Fix address macros (diff) | |
| download | kernel-a01512dbe3ec1e7dc58b00161d61ead359f5ac08.tar.gz kernel-a01512dbe3ec1e7dc58b00161d61ead359f5ac08.zip | |
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 <[email protected]>
Acked-by: Tom Herbert <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/strparser/strparser.c')
| -rw-r--r-- | net/strparser/strparser.c | 3 |
1 files changed, 0 insertions, 3 deletions
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; |