diff options
| author | Benson Leung <bleung@chromium.org> | 2018-07-09 16:36:00 -0700 |
|---|---|---|
| committer | Benson Leung <bleung@chromium.org> | 2018-07-09 16:36:00 -0700 |
| commit | 40291fb75123816b35ba06696e56b9cf2d96bf90 (patch) | |
| tree | dfff532af8df1c06ca83466c8347873426a81579 /net/l2tp/l2tp_ppp.c | |
| parent | c474e9f2be9992861d926eea3e5d4fb393cd6e2a (diff) | |
| parent | 413c94469a9db26ac4e1d16bf8de0248de93e2d8 (diff) | |
| download | linux-40291fb75123816b35ba06696e56b9cf2d96bf90.tar.gz linux-40291fb75123816b35ba06696e56b9cf2d96bf90.tar.bz2 linux-40291fb75123816b35ba06696e56b9cf2d96bf90.zip | |
Merge tag 'ib-platform-chrome-mfd-move-cros-ec-transport-for-4.19' into working-branch-for-4.19
Immutable branch (mfd, chrome) due for the v4.19 window
Immutable Branch which moves the cros_ec_i2c and cros_ec_spi
transport drivers from mfd to platform/chrome. Changes in arm are a simple
rename in defconfigs. Change in input is a rename in help text.
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, |