projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[cascardo/linux.git]
/
net
/
l2tp
/
l2tp_ppp.c
diff --git
a/net/l2tp/l2tp_ppp.c
b/net/l2tp/l2tp_ppp.c
index
d9560aa
..
232cb92
100644
(file)
--- 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;