[PATCH 5.13-rc4] Bluetooth: Fix VIRTIO_ID_BT assigned number

[PATCH 5.13-rc4] Bluetooth: Fix VIRTIO_ID_BT assigned number

[Marcel Holtmann]

It turned out that the VIRTIO_ID_* are not assigned in the virtio_ids.h
file in the upstream kernel. Picking the next free one was wrong and
there is a process that has been followed now.

See https://github.com/oasis-tcs/virtio-spec/issues/108 for details.

Fixes: afd2daa26c7a ("Bluetooth: Add support for virtio transport driver")
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
---
 include/uapi/linux/virtio_ids.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/uapi/linux/virtio_ids.h b/include/uapi/linux/virtio_ids.h
index f0c35ce8628c..4fe842c3a3a9 100644
--- a/include/uapi/linux/virtio_ids.h
+++ b/include/uapi/linux/virtio_ids.h
@@ -54,7 +54,7 @@
 #define VIRTIO_ID_SOUND			25 /* virtio sound */
 #define VIRTIO_ID_FS			26 /* virtio filesystem */
 #define VIRTIO_ID_PMEM			27 /* virtio pmem */
-#define VIRTIO_ID_BT			28 /* virtio bluetooth */
 #define VIRTIO_ID_MAC80211_HWSIM	29 /* virtio mac80211-hwsim */
+#define VIRTIO_ID_BT			40 /* virtio bluetooth */
 
 #endif /* _LINUX_VIRTIO_IDS_H */
-- 
2.31.1

Re: [PATCH 5.13-rc4] Bluetooth: Fix VIRTIO_ID_BT assigned number

[Luiz Augusto von Dentz]

Hi Marcel,

On Thu, Jun 3, 2021 at 12:22 PM Marcel Holtmann <marcel@holtmann.org> wrote:
>
> It turned out that the VIRTIO_ID_* are not assigned in the virtio_ids.h
> file in the upstream kernel. Picking the next free one was wrong and
> there is a process that has been followed now.
>
> See https://github.com/oasis-tcs/virtio-spec/issues/108 for details.
>
> Fixes: afd2daa26c7a ("Bluetooth: Add support for virtio transport driver")
> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
> ---
>  include/uapi/linux/virtio_ids.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/uapi/linux/virtio_ids.h b/include/uapi/linux/virtio_ids.h
> index f0c35ce8628c..4fe842c3a3a9 100644
> --- a/include/uapi/linux/virtio_ids.h
> +++ b/include/uapi/linux/virtio_ids.h
> @@ -54,7 +54,7 @@
>  #define VIRTIO_ID_SOUND                        25 /* virtio sound */
>  #define VIRTIO_ID_FS                   26 /* virtio filesystem */
>  #define VIRTIO_ID_PMEM                 27 /* virtio pmem */
> -#define VIRTIO_ID_BT                   28 /* virtio bluetooth */
>  #define VIRTIO_ID_MAC80211_HWSIM       29 /* virtio mac80211-hwsim */
> +#define VIRTIO_ID_BT                   40 /* virtio bluetooth */
>
>  #endif /* _LINUX_VIRTIO_IDS_H */
> --
> 2.31.1

Applied to bluetooth.git, thanks.

-- 
Luiz Augusto von Dentz