diff options
Diffstat (limited to 'net/bluetooth/hci_sock.c')
-rw-r--r-- | net/bluetooth/hci_sock.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c index 0bad296fe0af..65d734c165bd 100644 --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c | |||
@@ -878,7 +878,6 @@ static int hci_sock_release(struct socket *sock) | |||
878 | return 0; | 878 | return 0; |
879 | } | 879 | } |
880 | 880 | ||
881 | #ifdef CONFIG_BT_LEGACY_IOCTL | ||
882 | static int hci_sock_blacklist_add(struct hci_dev *hdev, void __user *arg) | 881 | static int hci_sock_blacklist_add(struct hci_dev *hdev, void __user *arg) |
883 | { | 882 | { |
884 | bdaddr_t bdaddr; | 883 | bdaddr_t bdaddr; |
@@ -1050,7 +1049,6 @@ done: | |||
1050 | release_sock(sk); | 1049 | release_sock(sk); |
1051 | return err; | 1050 | return err; |
1052 | } | 1051 | } |
1053 | #endif | ||
1054 | 1052 | ||
1055 | static int hci_sock_bind(struct socket *sock, struct sockaddr *addr, | 1053 | static int hci_sock_bind(struct socket *sock, struct sockaddr *addr, |
1056 | int addr_len) | 1054 | int addr_len) |
@@ -1971,11 +1969,7 @@ static const struct proto_ops hci_sock_ops = { | |||
1971 | .getname = hci_sock_getname, | 1969 | .getname = hci_sock_getname, |
1972 | .sendmsg = hci_sock_sendmsg, | 1970 | .sendmsg = hci_sock_sendmsg, |
1973 | .recvmsg = hci_sock_recvmsg, | 1971 | .recvmsg = hci_sock_recvmsg, |
1974 | #ifdef CONFIG_BT_LEGACY_IOCTL | ||
1975 | .ioctl = hci_sock_ioctl, | 1972 | .ioctl = hci_sock_ioctl, |
1976 | #else | ||
1977 | .ioctl = sock_no_ioctl, | ||
1978 | #endif | ||
1979 | .poll = datagram_poll, | 1973 | .poll = datagram_poll, |
1980 | .listen = sock_no_listen, | 1974 | .listen = sock_no_listen, |
1981 | .shutdown = sock_no_shutdown, | 1975 | .shutdown = sock_no_shutdown, |