diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-07-17 09:27:43 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-07-17 09:27:43 +0200 |
commit | 52b544bd386688177c41d53e748111c29d0ccc98 (patch) | |
tree | c2083582176e773084364af93cc44e0f94b6cde8 /net/l2tp/l2tp_ppp.c | |
parent | afed7bcf9487bb28e2e2b016a195085c07416c0b (diff) | |
parent | 9d3cce1e8b8561fed5f383d22a4d6949db4eadbe (diff) |
Merge tag 'v4.18-rc5' into locking/core, to pick up fixes
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 55188382845c..e398797878a9 100644 --- a/net/l2tp/l2tp_ppp.c +++ b/net/l2tp/l2tp_ppp.c @@ -1818,7 +1818,7 @@ static const struct proto_ops pppol2tp_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = pppol2tp_getname, - .poll_mask = datagram_poll_mask, + .poll = datagram_poll, .listen = sock_no_listen, .shutdown = sock_no_shutdown, .setsockopt = pppol2tp_setsockopt, |