diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-09-08 14:05:16 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-09-08 14:05:16 +0200 |
| commit | 950d8381d915ee293a5b57f91e59dd8115684af1 (patch) | |
| tree | 6a611a808da1e28c3db740ac9a54c01757af2e56 /net/l2tp/l2tp_ppp.c | |
| parent | 979515c5645830465739254abc1b1648ada41518 (diff) | |
| parent | d71f058617564750261b673ea9b3352382b9cde4 (diff) | |
Merge branch 'linus' into timers/core, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/l2tp/l2tp_ppp.c')
| -rw-r--r-- | net/l2tp/l2tp_ppp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c index d9560aa2dba3..232cb92033e8 100644 --- a/net/l2tp/l2tp_ppp.c +++ b/net/l2tp/l2tp_ppp.c @@ -856,7 +856,7 @@ static int pppol2tp_getname(struct socket *sock, struct sockaddr *uaddr, error = -ENOTCONN; if (sk == NULL) goto end; - if (sk->sk_state != PPPOX_CONNECTED) + if (!(sk->sk_state & PPPOX_CONNECTED)) goto end; error = -EBADF; |