diff options
| author | David S. Miller <davem@davemloft.net> | 2016-08-30 00:54:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-30 00:54:02 -0400 |
| commit | 6abdd5f5935fff978f950561f3c5175eb34dad73 (patch) | |
| tree | 6f3ed3a4f4af9e74436ec9355ebf8201357f1c40 /net/l2tp | |
| parent | 0b498a52778368ff501557d68c7b50878ab1701e (diff) | |
| parent | e4e98c460ad38c78498622a164fd5ef09a2dc9cb (diff) | |
| download | linux-6abdd5f5935fff978f950561f3c5175eb34dad73.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All three conflicts were cases of simple overlapping
changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/l2tp')
| -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 254ee662b214..34eff77982cf 100644 --- a/net/l2tp/l2tp_ppp.c +++ b/net/l2tp/l2tp_ppp.c @@ -854,7 +854,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; |