diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2018-07-03 09:20:22 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-07-03 09:20:22 +0200 |
| commit | 4520843dfa34417eb1e2061f60d2345d9ca614e1 (patch) | |
| tree | 7b983b8cf20c6154cf897000610c5b7c754e26d9 /net/bluetooth/l2cap_sock.c | |
| parent | sched/fair: Remove stale tg_unthrottle_up() comments (diff) | |
| parent | kthread, sched/core: Fix kthread_parkme() (again...) (diff) | |
| download | linux-dev-4520843dfa34417eb1e2061f60d2345d9ca614e1.tar.xz linux-dev-4520843dfa34417eb1e2061f60d2345d9ca614e1.zip | |
Merge branch 'sched/urgent' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/bluetooth/l2cap_sock.c')
| -rw-r--r-- | net/bluetooth/l2cap_sock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index 742a190034e6..686bdc6b35b0 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -1653,7 +1653,7 @@ static const struct proto_ops l2cap_sock_ops = { .getname = l2cap_sock_getname, .sendmsg = l2cap_sock_sendmsg, .recvmsg = l2cap_sock_recvmsg, - .poll_mask = bt_sock_poll_mask, + .poll = bt_sock_poll, .ioctl = bt_sock_ioctl, .mmap = sock_no_mmap, .socketpair = sock_no_socketpair, |