projects
/
linux
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'net-next/master'
[linux]
/
net
/
core
/
skmsg.c
diff --git
a/net/core/skmsg.c
b/net/core/skmsg.c
index
e76ed8d
..
ae6f06e
100644
(file)
--- a/
net/core/skmsg.c
+++ b/
net/core/skmsg.c
@@
-554,8
+554,7
@@
static void sk_psock_destroy_deferred(struct work_struct *gc)
struct sk_psock *psock = container_of(gc, struct sk_psock, gc);
/* No sk_callback_lock since already detached. */
- if (psock->parser.enabled)
- strp_done(&psock->parser.strp);
+ strp_done(&psock->parser.strp);
cancel_work_sync(&psock->work);