diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-05-07 00:27:53 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-05-07 00:27:53 -0700 |
| commit | d5bb306b42e39ffecaf85d1f9d04a3b5d9a97c86 (patch) | |
| tree | 61af7e7d4cdf7994f2bd6ffb8263f82fe304ea4c /net/bluetooth/hci_sock.c | |
| parent | 823036ed3291e30f32a905c94db821cd75524b59 (diff) | |
| parent | 7bb078cba9ef55d810275b533747fa96a12e1823 (diff) | |
| download | kernel-crypto-d5bb306b42e39ffecaf85d1f9d04a3b5d9a97c86.tar.gz kernel-crypto-d5bb306b42e39ffecaf85d1f9d04a3b5d9a97c86.tar.xz kernel-crypto-d5bb306b42e39ffecaf85d1f9d04a3b5d9a97c86.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'net/bluetooth/hci_sock.c')
| -rw-r--r-- | net/bluetooth/hci_sock.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c index 832b5f44be5..bfc9a35bad3 100644 --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c @@ -499,6 +499,15 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname, char break; case HCI_FILTER: + { + struct hci_filter *f = &hci_pi(sk)->filter; + + uf.type_mask = f->type_mask; + uf.opcode = f->opcode; + uf.event_mask[0] = *((u32 *) f->event_mask + 0); + uf.event_mask[1] = *((u32 *) f->event_mask + 1); + } + len = min_t(unsigned int, len, sizeof(uf)); if (copy_from_user(&uf, optval, len)) { err = -EFAULT; |