diff options
-rw-r--r-- | include/net/bluetooth/hci_core.h | 1 | ||||
-rw-r--r-- | net/bluetooth/hci_sock.c | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index c06552769644..237bf8c03fb4 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h | |||
@@ -287,7 +287,6 @@ struct hci_dev { | |||
287 | int (*setup)(struct hci_dev *hdev); | 287 | int (*setup)(struct hci_dev *hdev); |
288 | int (*send)(struct sk_buff *skb); | 288 | int (*send)(struct sk_buff *skb); |
289 | void (*notify)(struct hci_dev *hdev, unsigned int evt); | 289 | void (*notify)(struct hci_dev *hdev, unsigned int evt); |
290 | int (*ioctl)(struct hci_dev *hdev, unsigned int cmd, unsigned long arg); | ||
291 | }; | 290 | }; |
292 | 291 | ||
293 | #define HCI_PHY_HANDLE(handle) (handle & 0xff) | 292 | #define HCI_PHY_HANDLE(handle) (handle & 0xff) |
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c index 5b2d3f3c9b67..3beaa0594009 100644 --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c | |||
@@ -553,10 +553,7 @@ static int hci_sock_bound_ioctl(struct sock *sk, unsigned int cmd, | |||
553 | return hci_sock_blacklist_del(hdev, (void __user *) arg); | 553 | return hci_sock_blacklist_del(hdev, (void __user *) arg); |
554 | } | 554 | } |
555 | 555 | ||
556 | if (hdev->ioctl) | 556 | return -ENOIOCTLCMD; |
557 | return hdev->ioctl(hdev, cmd, arg); | ||
558 | |||
559 | return -EINVAL; | ||
560 | } | 557 | } |
561 | 558 | ||
562 | static int hci_sock_ioctl(struct socket *sock, unsigned int cmd, | 559 | static int hci_sock_ioctl(struct socket *sock, unsigned int cmd, |