FAILED: patch "[PATCH] Bluetooth: HCI: Remove HCI_AMP support" failed to apply to 6.1-stable tree
Subsystems (5)
[email protected]
maintainerThe patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 84a4bb6548a29326564f0e659fb8064503ecc1c7
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026072135-skiing-jawline-cb0b@gregkh' --subject-prefix 'PATCH 6.1.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 84a4bb6548a29326564f0e659fb8064503ecc1c7 Mon Sep 17 00:00:00 2001
From: Luiz Augusto von Dentz <[email protected]>
Date: Mon, 6 May 2024 18:33:52 -0400
Subject: [PATCH] Bluetooth: HCI: Remove HCI_AMP support
Since BT_HS has been remove HCI_AMP controllers no longer has any use so remove it along with the capability of creating AMP controllers.
Since we no longer need to differentiate between AMP and Primary controllers, as only HCI_PRIMARY is left, this also remove hdev->dev_type altogether.
drivers/bluetooth/btmrvl_main.c +0 -9
@@ -121,13 +121,6 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb) ((event->data[2 ] ==MODULE_BROUGHT_UP ) || (event->data[2 ] ==MODULE_ALREADY_UP )) ? "Bring-up succeed" : "Bring-up failed"); - -if (event->length >3 && event->data[3 ]) - priv->btmrvl_dev.dev_type =HCI_AMP ; -else - priv->btmrvl_dev.dev_type =HCI_PRIMARY ; - -BT_DBG ("dev_type: %d" , priv->btmrvl_dev.dev_type); }else if (priv->btmrvl_dev.sendcmdflag && event->data[1 ] ==MODULE_SHUTDOWN_REQ ) { BT_DBG("EVENT:%s", (event->data[2]) ?
@@ -686,8 +679,6 @@ int btmrvl_register_hdev(struct btmrvl_private *priv) hdev->wakeup = btmrvl_wakeup;SET_HCIDEV_DEV (hdev, &card->func->dev); - hdev->dev_type = priv->btmrvl_dev.dev_type; - ret =hci_register_dev (hdev);if (ret <0 ) {BT_ERR ("Can not register HCI device" );
drivers/bluetooth/btrsi.c +0 -1
@@ -134,7 +134,6 @@ static int rsi_hci_attach(void *priv, struct rsi_proto_ops *ops) hdev->bus =HCI_USB ;hci_set_drvdata (hdev, h_adapter); - hdev->dev_type =HCI_PRIMARY ; hdev->open = rsi_hci_open; hdev->close = rsi_hci_close; hdev->flush = rsi_hci_flush;
drivers/bluetooth/btsdio.c +0 -8
@@ -32,9 +32,6 @@ static const struct sdio_device_id btsdio_table[] = {/* Generic Bluetooth Type-B SDIO device */ { SDIO_DEVICE_CLASS(SDIO_CLASS_BT_B) }, -/* Generic Bluetooth AMP controller */ - { SDIO_DEVICE_CLASS(SDIO_CLASS_BT_AMP) }, - { }/* Terminating entry */ };
@@ -319,11 +316,6 @@ static int btsdio_probe(struct sdio_func *func, hdev->bus =HCI_SDIO ;hci_set_drvdata (hdev, data); -if (id->class ==SDIO_CLASS_BT_AMP ) - hdev->dev_type =HCI_AMP ; -else - hdev->dev_type =HCI_PRIMARY ; - data->hdev = hdev;SET_HCIDEV_DEV (hdev, &func->dev);
drivers/bluetooth/btusb.c +0 -5
@@ -4359,11 +4359,6 @@ static int btusb_probe(struct usb_interface *intf, hdev->bus =HCI_USB ;hci_set_drvdata (hdev, data); -if (id->driver_info &BTUSB_AMP ) - hdev->dev_type =HCI_AMP ; -else - hdev->dev_type =HCI_PRIMARY ; - data->hdev = hdev;SET_HCIDEV_DEV (hdev, &intf->dev);
drivers/bluetooth/hci_bcm4377.c +0 -1
@@ -2361,7 +2361,6 @@ static int bcm4377_probe(struct pci_dev *pdev, const struct pci_device_id *id) bcm4377->hdev = hdev; hdev->bus =HCI_PCI ; - hdev->dev_type =HCI_PRIMARY ; hdev->open = bcm4377_hci_open; hdev->close = bcm4377_hci_close; hdev->send = bcm4377_hci_send_frame;
drivers/bluetooth/hci_ldisc.c +0 -6
@@ -667,11 +667,6 @@ static int hci_uart_register_dev(struct hci_uart *hu)if (!test_bit (HCI_UART_RESET_ON_INIT , &hu->hdev_flags))set_bit (HCI_QUIRK_RESET_ON_CLOSE , &hdev->quirks); -if (test_bit (HCI_UART_CREATE_AMP , &hu->hdev_flags)) - hdev->dev_type =HCI_AMP ; -else - hdev->dev_type =HCI_PRIMARY ; -/* Only call open() for the protocol after hdev is fully initialized as * open() (or a timer/workqueue it starts) may attempt to reference it. */
@@ -722,7 +717,6 @@ static int hci_uart_set_flags(struct hci_uart *hu, unsigned long flags) {unsigned long valid_flags =BIT (HCI_UART_RAW_DEVICE ) |BIT (HCI_UART_RESET_ON_INIT ) | -BIT (HCI_UART_CREATE_AMP ) |BIT (HCI_UART_INIT_PENDING ) |BIT (HCI_UART_EXT_CONFIG ) |BIT (HCI_UART_VND_DETECT );
drivers/bluetooth/hci_serdev.c +0 -5
@@ -366,11 +366,6 @@ int hci_uart_register_device_priv(struct hci_uart *hu,if (test_bit (HCI_UART_EXT_CONFIG , &hu->hdev_flags))set_bit (HCI_QUIRK_EXTERNAL_CONFIG , &hdev->quirks); -if (test_bit (HCI_UART_CREATE_AMP , &hu->hdev_flags)) - hdev->dev_type =HCI_AMP ; -else - hdev->dev_type =HCI_PRIMARY ; -if (test_bit (HCI_UART_INIT_PENDING , &hu->hdev_flags))return 0 ;
drivers/bluetooth/hci_uart.h +0 -1
@@ -37,7 +37,6 @@#define HCI_UART_RAW_DEVICE 0#define HCI_UART_RESET_ON_INIT 1 -#define HCI_UART_CREATE_AMP 2#define HCI_UART_INIT_PENDING 3#define HCI_UART_EXT_CONFIG 4#define HCI_UART_VND_DETECT 5
drivers/bluetooth/hci_vhci.c +1 -9
@@ -384,17 +384,10 @@ static int __vhci_create_device(struct vhci_data *data, __u8 opcode) {struct hci_dev *hdev;struct sk_buff *skb; -__u8 dev_type;if (data->hdev)return -EBADFD ; -/* bits 0-1 are dev_type (Primary or AMP) */ - dev_type = opcode &0x03 ; - -if (dev_type !=HCI_PRIMARY && dev_type !=HCI_AMP ) -return -EINVAL ; -/* bits 2-5 are reserved (must be zero) */ if (opcode &0x3c )return -EINVAL ;
@@ -412,7 +405,6 @@ static int __vhci_create_device(struct vhci_data *data, __u8 opcode) data->hdev = hdev; hdev->bus =HCI_VIRTUAL ; - hdev->dev_type = dev_type;hci_set_drvdata (hdev, data); hdev->open = vhci_open_dev;
@@ -634,7 +626,7 @@ static void vhci_open_timeout(struct work_struct *work) struct vhci_data *data = container_of(work, struct vhci_data, open_timeout.work); -vhci_create_device (data, amp ?HCI_AMP :HCI_PRIMARY ); +vhci_create_device (data,0x00 ); }static int vhci_open (struct inode *inode,struct file *file)
drivers/bluetooth/virtio_bt.c +0 -2
@@ -274,7 +274,6 @@ static int virtbt_probe(struct virtio_device *vdev)switch (type) {case VIRTIO_BT_CONFIG_TYPE_PRIMARY : -case VIRTIO_BT_CONFIG_TYPE_AMP :break ;default :return -EINVAL ;
@@ -303,7 +302,6 @@ static int virtbt_probe(struct virtio_device *vdev) vbt->hdev = hdev; hdev->bus =HCI_VIRTIO ; - hdev->dev_type = type;hci_set_drvdata (hdev, vbt); hdev->open = virtbt_open;
include/net/bluetooth/hci.h +0 -114
144 lines not on this page · raw message
include/net/bluetooth/hci_core.h +1 -45
118 lines not on this page · raw message
include/uapi/linux/virtio_bt.h +0 -1
@@ -13,7 +13,6 @@enum virtio_bt_config_type {VIRTIO_BT_CONFIG_TYPE_PRIMARY =0 , -VIRTIO_BT_CONFIG_TYPE_AMP =1 , };enum virtio_bt_config_vendor {
net/bluetooth/hci_conn.c +1 -2
@@ -1168,8 +1168,7 @@ struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src, uint8_t src_type)list_for_each_entry (d, &hci_dev_list, list) {if (!test_bit (HCI_UP , &d->flags) || -hci_dev_test_flag (d,HCI_USER_CHANNEL ) || - d->dev_type !=HCI_PRIMARY ) +hci_dev_test_flag (d,HCI_USER_CHANNEL ))continue ;/* Simple routing:
net/bluetooth/hci_core.c +10 -122
199 lines not on this page · raw message
net/bluetooth/hci_event.c +0 -147
189 lines not on this page · raw message
net/bluetooth/hci_sock.c +1 -4
@@ -485,7 +485,7 @@ static struct sk_buff *create_monitor_event(struct hci_dev *hdev, int event)return NULL ; ni =skb_put (skb,HCI_MON_NEW_INDEX_SIZE ); - ni->type = hdev->dev_type; + ni->type =0x00 ;/* Old hdev->dev_type */ ni->bus = hdev->bus;bacpy (&ni->bdaddr, &hdev->bdaddr); memcpy_and_pad(ni->name, sizeof(ni->name), hdev->name,
@@ -1007,9 +1007,6 @@ static int hci_sock_bound_ioctl(struct sock *sk, unsigned int cmd,if (hci_dev_test_flag (hdev,HCI_UNCONFIGURED ))return -EOPNOTSUPP ; -if (hdev->dev_type !=HCI_PRIMARY ) -return -EOPNOTSUPP ; -switch (cmd) {case HCISETRAW :if (!capable (CAP_NET_ADMIN ))
net/bluetooth/hci_sync.c +4 -108
187 lines not on this page · raw message
net/bluetooth/l2cap_core.c +4 -17
@@ -3932,7 +3932,7 @@ static inline int l2cap_command_rej(struct l2cap_conn *conn, }static void l2cap_connect (struct l2cap_conn *conn,struct l2cap_cmd_hdr *cmd, -u8 *data,u8 rsp_code,u8 amp_id) +u8 *data,u8 rsp_code) {struct l2cap_conn_req *req = (struct l2cap_conn_req *) data;struct l2cap_conn_rsp rsp;
@@ -4011,17 +4011,8 @@ static void l2cap_connect(struct l2cap_conn *conn, struct l2cap_cmd_hdr *cmd, status =L2CAP_CS_AUTHOR_PEND ; chan->ops->defer (chan); }else { -/* Force pending result for AMP controllers. -* The connection will succeed after the -* physical link is up. -*/ -if (amp_id ==AMP_ID_BREDR ) { -l2cap_state_change (chan,BT_CONFIG ); - result =L2CAP_CR_SUCCESS ; - }else { -l2cap_state_change (chan,BT_CONNECT2 ); - result =L2CAP_CR_PEND ; - } +l2cap_state_change (chan,BT_CONNECT2 ); + result =L2CAP_CR_PEND ; status =L2CAP_CS_NO_INFO ; } }else {
@@ -4086,7 +4077,7 @@ static int l2cap_connect_req(struct l2cap_conn *conn,mgmt_device_connected (hdev, hcon,NULL ,0 );hci_dev_unlock (hdev); -l2cap_connect (conn, cmd, data,L2CAP_CONN_RSP ,0 ); +l2cap_connect (conn, cmd, data,L2CAP_CONN_RSP );return 0 ; }
@@ -7491,10 +7482,6 @@ void l2cap_recv_acldata(struct hci_conn *hcon, struct sk_buff *skb, u16 flags)struct l2cap_conn *conn = hcon->l2cap_data;int len; -/* For AMP controller do not create l2cap conn */ -if (!conn && hcon->hdev->dev_type !=HCI_PRIMARY ) - goto drop; -if (!conn) conn =l2cap_conn_add (hcon);
net/bluetooth/mgmt.c +27 -57
133 lines not on this page · raw message
Sasha Levin
maintainerPATCH 1/2 Bluetooth: Remove usage of the deprecated ida_simple_xx() API
From: Christophe JAILLET <[email protected]>
[ Upstream commit 9c16d0c8d93e3d2a95c5ed927b061f244db75579 ]
ida_alloc() and ida_free() should be preferred to the deprecated ida_simple_get() and ida_simple_remove().
Note that the upper limit of ida_simple_get() is exclusive, but the one of ida_alloc_max() is inclusive. So a -1 has been added when needed.
Stable-dep-of: 84a4bb6548a2 ("Bluetooth: HCI: Remove HCI_AMP support")
--- net/bluetooth/hci_core.c | 9 +++++---- net/bluetooth/hci_sock.c | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-)
net/bluetooth/hci_core.c +5 -4
@@ -2596,10 +2596,11 @@ int hci_register_dev(struct hci_dev *hdev)*/ switch (hdev->dev_type) {case HCI_PRIMARY : - id =ida_simple_get (&hci_index_ida,0 ,HCI_MAX_ID ,GFP_KERNEL ); + id =ida_alloc_max (&hci_index_ida,HCI_MAX_ID -1 ,GFP_KERNEL );break ;case HCI_AMP : - id =ida_simple_get (&hci_index_ida,1 ,HCI_MAX_ID ,GFP_KERNEL ); + id =ida_alloc_range (&hci_index_ida,1 ,HCI_MAX_ID -1 , +GFP_KERNEL );break ;default :return -EINVAL ;
@@ -2698,7 +2699,7 @@ int hci_register_dev(struct hci_dev *hdev)destroy_workqueue (hdev->workqueue);destroy_workqueue (hdev->req_workqueue); err: -ida_simple_remove (&hci_index_ida, hdev->id); +ida_free (&hci_index_ida, hdev->id);return error; }
@@ -2787,7 +2788,7 @@ void hci_release_dev(struct hci_dev *hdev)hci_dev_unlock (hdev);ida_destroy (&hdev->unset_handle_ida); -ida_simple_remove (&hci_index_ida, hdev->id); +ida_free (&hci_index_ida, hdev->id);kfree_skb (hdev->sent_cmd);kfree_skb (hdev->recv_event);kfree (hdev);
net/bluetooth/hci_sock.c +2 -2
@@ -101,7 +101,7 @@ static bool hci_sock_gen_cookie(struct sock *sk)int id =hci_pi (sk)->cookie;if (!id) { - id =ida_simple_get (&sock_cookie_ida,1 ,0 ,GFP_KERNEL ); + id =ida_alloc_min (&sock_cookie_ida,1 ,GFP_KERNEL );if (id <0 ) id =0xffffffff ;
@@ -119,7 +119,7 @@ static void hci_sock_free_cookie(struct sock *sk)if (id) {hci_pi (sk)->cookie =0xffffffff ; -ida_simple_remove (&sock_cookie_ida, id); +ida_free (&sock_cookie_ida, id); } }
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/2 Bluetooth: HCI: Remove HCI_AMP support
From: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit 84a4bb6548a29326564f0e659fb8064503ecc1c7 ]
Since BT_HS has been remove HCI_AMP controllers no longer has any use so remove it along with the capability of creating AMP controllers.
Since we no longer need to differentiate between AMP and Primary controllers, as only HCI_PRIMARY is left, this also remove hdev->dev_type altogether.
--- drivers/bluetooth/btmrvl_main.c | 9 -- drivers/bluetooth/btrsi.c | 1 - drivers/bluetooth/btsdio.c | 8 -- drivers/bluetooth/btusb.c | 5 -- drivers/bluetooth/hci_ldisc.c | 6 -- drivers/bluetooth/hci_serdev.c | 5 -- drivers/bluetooth/hci_uart.h | 1 - drivers/bluetooth/hci_vhci.c | 10 +-- drivers/bluetooth/virtio_bt.c | 2 - include/net/bluetooth/hci.h | 114 ------------------------ include/net/bluetooth/hci_core.h | 46 +--------- include/uapi/linux/virtio_bt.h | 1 - net/bluetooth/hci_conn.c | 24 ++--- net/bluetooth/hci_core.c | 132 +++------------------------ net/bluetooth/hci_event.c | 147 ------------------------------- net/bluetooth/hci_sock.c | 5 +- net/bluetooth/hci_sync.c | 112 +---------------------- net/bluetooth/l2cap_core.c | 21 +---- net/bluetooth/mgmt.c | 84 ++++++------------ 19 files changed, 55 insertions(+), 678 deletions(-)
drivers/bluetooth/btmrvl_main.c +0 -9
@@ -121,13 +121,6 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb) ((event->data[2 ] ==MODULE_BROUGHT_UP ) || (event->data[2 ] ==MODULE_ALREADY_UP )) ? "Bring-up succeed" : "Bring-up failed"); - -if (event->length >3 && event->data[3 ]) - priv->btmrvl_dev.dev_type =HCI_AMP ; -else - priv->btmrvl_dev.dev_type =HCI_PRIMARY ; - -BT_DBG ("dev_type: %d" , priv->btmrvl_dev.dev_type); }else if (priv->btmrvl_dev.sendcmdflag && event->data[1 ] ==MODULE_SHUTDOWN_REQ ) { BT_DBG("EVENT:%s", (event->data[2]) ?
@@ -686,8 +679,6 @@ int btmrvl_register_hdev(struct btmrvl_private *priv) hdev->wakeup = btmrvl_wakeup;SET_HCIDEV_DEV (hdev, &card->func->dev); - hdev->dev_type = priv->btmrvl_dev.dev_type; - ret =hci_register_dev (hdev);if (ret <0 ) {BT_ERR ("Can not register HCI device" );
drivers/bluetooth/btrsi.c +0 -1
@@ -134,7 +134,6 @@ static int rsi_hci_attach(void *priv, struct rsi_proto_ops *ops) hdev->bus =HCI_USB ;hci_set_drvdata (hdev, h_adapter); - hdev->dev_type =HCI_PRIMARY ; hdev->open = rsi_hci_open; hdev->close = rsi_hci_close; hdev->flush = rsi_hci_flush;
drivers/bluetooth/btsdio.c +0 -8
@@ -32,9 +32,6 @@ static const struct sdio_device_id btsdio_table[] = {/* Generic Bluetooth Type-B SDIO device */ { SDIO_DEVICE_CLASS(SDIO_CLASS_BT_B) }, -/* Generic Bluetooth AMP controller */ - { SDIO_DEVICE_CLASS(SDIO_CLASS_BT_AMP) }, - { }/* Terminating entry */ };
@@ -319,11 +316,6 @@ static int btsdio_probe(struct sdio_func *func, hdev->bus =HCI_SDIO ;hci_set_drvdata (hdev, data); -if (id->class ==SDIO_CLASS_BT_AMP ) - hdev->dev_type =HCI_AMP ; -else - hdev->dev_type =HCI_PRIMARY ; - data->hdev = hdev;SET_HCIDEV_DEV (hdev, &func->dev);
drivers/bluetooth/btusb.c +0 -5
@@ -3952,11 +3952,6 @@ static int btusb_probe(struct usb_interface *intf, hdev->bus =HCI_USB ;hci_set_drvdata (hdev, data); -if (id->driver_info &BTUSB_AMP ) - hdev->dev_type =HCI_AMP ; -else - hdev->dev_type =HCI_PRIMARY ; - data->hdev = hdev;SET_HCIDEV_DEV (hdev, &intf->dev);
drivers/bluetooth/hci_ldisc.c +0 -6
@@ -700,11 +700,6 @@ static int hci_uart_register_dev(struct hci_uart *hu)if (!test_bit (HCI_UART_RESET_ON_INIT , &hu->hdev_flags))set_bit (HCI_QUIRK_RESET_ON_CLOSE , &hdev->quirks); -if (test_bit (HCI_UART_CREATE_AMP , &hu->hdev_flags)) - hdev->dev_type =HCI_AMP ; -else - hdev->dev_type =HCI_PRIMARY ; -/* Only call open() for the protocol after hdev is fully initialized as * open() (or a timer/workqueue it starts) may attempt to reference it. */
@@ -766,7 +761,6 @@ static int hci_uart_set_flags(struct hci_uart *hu, unsigned long flags) {unsigned long valid_flags =BIT (HCI_UART_RAW_DEVICE ) |BIT (HCI_UART_RESET_ON_INIT ) | -BIT (HCI_UART_CREATE_AMP ) |BIT (HCI_UART_INIT_PENDING ) |BIT (HCI_UART_EXT_CONFIG ) |BIT (HCI_UART_VND_DETECT );
drivers/bluetooth/hci_serdev.c +0 -5
@@ -365,11 +365,6 @@ int hci_uart_register_device(struct hci_uart *hu,if (test_bit (HCI_UART_EXT_CONFIG , &hu->hdev_flags))set_bit (HCI_QUIRK_EXTERNAL_CONFIG , &hdev->quirks); -if (test_bit (HCI_UART_CREATE_AMP , &hu->hdev_flags)) - hdev->dev_type =HCI_AMP ; -else - hdev->dev_type =HCI_PRIMARY ; -if (test_bit (HCI_UART_INIT_PENDING , &hu->hdev_flags))return 0 ;
drivers/bluetooth/hci_uart.h +0 -1
@@ -37,7 +37,6 @@#define HCI_UART_RAW_DEVICE 0#define HCI_UART_RESET_ON_INIT 1 -#define HCI_UART_CREATE_AMP 2#define HCI_UART_INIT_PENDING 3#define HCI_UART_EXT_CONFIG 4#define HCI_UART_VND_DETECT 5
drivers/bluetooth/hci_vhci.c +1 -9
@@ -286,17 +286,10 @@ static int __vhci_create_device(struct vhci_data *data, __u8 opcode) {struct hci_dev *hdev;struct sk_buff *skb; -__u8 dev_type;if (data->hdev)return -EBADFD ; -/* bits 0-1 are dev_type (Primary or AMP) */ - dev_type = opcode &0x03 ; - -if (dev_type !=HCI_PRIMARY && dev_type !=HCI_AMP ) -return -EINVAL ; -/* bits 2-5 are reserved (must be zero) */ if (opcode &0x3c )return -EINVAL ;
@@ -314,7 +307,6 @@ static int __vhci_create_device(struct vhci_data *data, __u8 opcode) data->hdev = hdev; hdev->bus =HCI_VIRTUAL ; - hdev->dev_type = dev_type;hci_set_drvdata (hdev, data); hdev->open = vhci_open_dev;
@@ -533,7 +525,7 @@ static void vhci_open_timeout(struct work_struct *work) struct vhci_data *data = container_of(work, struct vhci_data, open_timeout.work); -vhci_create_device (data, amp ?HCI_AMP :HCI_PRIMARY ); +vhci_create_device (data,0x00 ); }static int vhci_open (struct inode *inode,struct file *file)
drivers/bluetooth/virtio_bt.c +0 -2
@@ -291,7 +291,6 @@ static int virtbt_probe(struct virtio_device *vdev)switch (type) {case VIRTIO_BT_CONFIG_TYPE_PRIMARY : -case VIRTIO_BT_CONFIG_TYPE_AMP :break ;default :return -EINVAL ;
@@ -320,7 +319,6 @@ static int virtbt_probe(struct virtio_device *vdev) vbt->hdev = hdev; hdev->bus =HCI_VIRTIO ; - hdev->dev_type = type;hci_set_drvdata (hdev, vbt); hdev->open = virtbt_open;
include/net/bluetooth/hci.h +0 -114
144 lines not on this page · raw message
include/net/bluetooth/hci_core.h +1 -45
118 lines not on this page · raw message
include/uapi/linux/virtio_bt.h +0 -1
@@ -12,7 +12,6 @@enum virtio_bt_config_type {VIRTIO_BT_CONFIG_TYPE_PRIMARY =0 , -VIRTIO_BT_CONFIG_TYPE_AMP =1 , };enum virtio_bt_config_vendor {
net/bluetooth/hci_conn.c +7 -17
@@ -1193,8 +1193,7 @@ struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src, uint8_t src_type)list_for_each_entry (d, &hci_dev_list, list) {if (!test_bit (HCI_UP , &d->flags) || -hci_dev_test_flag (d,HCI_USER_CHANNEL ) || - d->dev_type !=HCI_PRIMARY ) +hci_dev_test_flag (d,HCI_USER_CHANNEL ))continue ;/* Simple routing:
@@ -2878,26 +2877,17 @@ int hci_abort_conn(struct hci_conn *conn, u8 reason)switch (conn->state) {case BT_CONNECTED : -case BT_CONFIG : -if (conn->type ==AMP_LINK ) { -struct hci_cp_disconn_phy_link cp; - - cp.phy_handle =HCI_PHY_HANDLE (conn->handle); - cp.reason = reason; - r =hci_send_cmd (conn->hdev,HCI_OP_DISCONN_PHY_LINK , -sizeof (cp), &cp); - }else { -struct hci_cp_disconnect dc; +case BT_CONFIG : { +struct hci_cp_disconnect dc; - dc.handle =cpu_to_le16 (conn->handle); - dc.reason = reason; - r =hci_send_cmd (conn->hdev,HCI_OP_DISCONNECT , -sizeof (dc), &dc); - } + dc.handle =cpu_to_le16 (conn->handle); + dc.reason = reason; + r =hci_send_cmd (conn->hdev,HCI_OP_DISCONNECT ,sizeof (dc), &dc); conn->state =BT_DISCONN ;break ; + }case BT_CONNECT :if (conn->type ==LE_LINK ) {if (test_bit (HCI_CONN_SCANNING , &conn->flags))
net/bluetooth/hci_core.c +10 -122
199 lines not on this page · raw message
net/bluetooth/hci_event.c +0 -147
189 lines not on this page · raw message
net/bluetooth/hci_sock.c +1 -4
@@ -436,7 +436,7 @@ static struct sk_buff *create_monitor_event(struct hci_dev *hdev, int event)return NULL ; ni =skb_put (skb,HCI_MON_NEW_INDEX_SIZE ); - ni->type = hdev->dev_type; + ni->type =0x00 ;/* Old hdev->dev_type */ ni->bus = hdev->bus;bacpy (&ni->bdaddr, &hdev->bdaddr); memcpy_and_pad(ni->name, sizeof(ni->name), hdev->name,
@@ -950,9 +950,6 @@ static int hci_sock_bound_ioctl(struct sock *sk, unsigned int cmd,if (hci_dev_test_flag (hdev,HCI_UNCONFIGURED ))return -EOPNOTSUPP ; -if (hdev->dev_type !=HCI_PRIMARY ) -return -EOPNOTSUPP ; -switch (cmd) {case HCISETRAW :if (!capable (CAP_NET_ADMIN ))
net/bluetooth/hci_sync.c +4 -108
187 lines not on this page · raw message
net/bluetooth/l2cap_core.c +4 -17
@@ -4054,7 +4054,7 @@ static struct l2cap_chan *l2cap_new_connection(struct l2cap_conn *conn, }static void l2cap_connect (struct l2cap_conn *conn,struct l2cap_cmd_hdr *cmd, -u8 *data,u8 rsp_code,u8 amp_id) +u8 *data,u8 rsp_code) {struct l2cap_conn_req *req = (struct l2cap_conn_req *) data;struct l2cap_conn_rsp rsp;
@@ -4132,17 +4132,8 @@ static void l2cap_connect(struct l2cap_conn *conn, struct l2cap_cmd_hdr *cmd, status =L2CAP_CS_AUTHOR_PEND ; chan->ops->defer (chan); }else { -/* Force pending result for AMP controllers. -* The connection will succeed after the -* physical link is up. -*/ -if (amp_id ==AMP_ID_BREDR ) { -l2cap_state_change (chan,BT_CONFIG ); - result =L2CAP_CR_SUCCESS ; - }else { -l2cap_state_change (chan,BT_CONNECT2 ); - result =L2CAP_CR_PEND ; - } +l2cap_state_change (chan,BT_CONFIG ); + result =L2CAP_CR_SUCCESS ; status =L2CAP_CS_NO_INFO ; } }else {
@@ -4199,7 +4190,7 @@ static int l2cap_connect_req(struct l2cap_conn *conn,if (cmd_len <sizeof (struct l2cap_conn_req ))return -EPROTO ; -l2cap_connect (conn, cmd, data,L2CAP_CONN_RSP ,0 ); +l2cap_connect (conn, cmd, data,L2CAP_CONN_RSP );return 0 ; }
@@ -7802,10 +7793,6 @@ void l2cap_recv_acldata(struct hci_conn *hcon, struct sk_buff *skb, u16 flags)struct l2cap_conn *conn = hcon->l2cap_data;int len; -/* For AMP controller do not create l2cap conn */ -if (!conn && hcon->hdev->dev_type !=HCI_PRIMARY ) - goto drop; -if (!conn) conn =l2cap_conn_add (hcon);
net/bluetooth/mgmt.c +27 -57
133 lines not on this page · raw message
Signature · 1 line
2.53.0