2020-06-12 19:37:33

by Alain Michaud

Subject: [PATCH] bluetooth: Fix op_code size entry from the previous patch

The previous applied patch introduced an error that was not present in
the submitted patch here: https://patchwork.kernel.org/patch/11599123/

In particular MGMT_SET_DEF_SYSTEM_CONFIG_SIZE was introduced but
MGMT_SET_DEF_SYSTEM_CONFIG was used.

Signed-off-by: Alain Michaud <[email protected]>
---

net/bluetooth/mgmt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 2e0f976e7e04..99fbfd467d04 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -7303,7 +7303,7 @@ static const struct hci_mgmt_handler mgmt_handlers[] = {
HCI_MGMT_HDEV_OPTIONAL },
{ read_def_system_config, MGMT_READ_DEF_SYSTEM_CONFIG_SIZE,
HCI_MGMT_UNTRUSTED },
- { set_def_system_config, MGMT_SET_DEF_SYSTEM_CONFIG,
+ { set_def_system_config, MGMT_SET_DEF_SYSTEM_CONFIG_SIZE,
HCI_MGMT_VAR_LEN },
};

--
2.27.0.290.gba653c62da-goog

2020-06-12 19:42:38

by Marcel Holtmann

Subject: Re: [PATCH] bluetooth: Fix op_code size entry from the previous patch

Hi Alain,

> The previous applied patch introduced an error that was not present in
> the submitted patch here: https://patchwork.kernel.org/patch/11599123/
>
> In particular MGMT_SET_DEF_SYSTEM_CONFIG_SIZE was introduced but
> MGMT_SET_DEF_SYSTEM_CONFIG was used.
>
> Signed-off-by: Alain Michaud <[email protected]>
> ---
>
> net/bluetooth/mgmt.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
> index 2e0f976e7e04..99fbfd467d04 100644
> --- a/net/bluetooth/mgmt.c
> +++ b/net/bluetooth/mgmt.c
> @@ -7303,7 +7303,7 @@ static const struct hci_mgmt_handler mgmt_handlers[] = {
> HCI_MGMT_HDEV_OPTIONAL },
> { read_def_system_config, MGMT_READ_DEF_SYSTEM_CONFIG_SIZE,
> HCI_MGMT_UNTRUSTED },
> - { set_def_system_config, MGMT_SET_DEF_SYSTEM_CONFIG,
> + { set_def_system_config, MGMT_SET_DEF_SYSTEM_CONFIG_SIZE,
> HCI_MGMT_VAR_LEN },

This was me being stupid. I had this fixed up in my tree, but forgot to amend the commit. I force pushed a correct commit to bluetooth-next now.

Regards

Marcel

2020-06-12 19:52:21

by Alain Michaud

Subject: Re: [PATCH] bluetooth: Fix op_code size entry from the previous patch

OK, thanks!

On Fri, Jun 12, 2020 at 3:42 PM Marcel Holtmann <[email protected]> wrote:
>
> Hi Alain,
>
> > The previous applied patch introduced an error that was not present in
> > the submitted patch here: https://patchwork.kernel.org/patch/11599123/
> >
> > In particular MGMT_SET_DEF_SYSTEM_CONFIG_SIZE was introduced but
> > MGMT_SET_DEF_SYSTEM_CONFIG was used.
> >
> > Signed-off-by: Alain Michaud <[email protected]>
> > ---
> >
> > net/bluetooth/mgmt.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
> > index 2e0f976e7e04..99fbfd467d04 100644
> > --- a/net/bluetooth/mgmt.c
> > +++ b/net/bluetooth/mgmt.c
> > @@ -7303,7 +7303,7 @@ static const struct hci_mgmt_handler mgmt_handlers[] = {
> > HCI_MGMT_HDEV_OPTIONAL },
> > { read_def_system_config, MGMT_READ_DEF_SYSTEM_CONFIG_SIZE,
> > HCI_MGMT_UNTRUSTED },
> > - { set_def_system_config, MGMT_SET_DEF_SYSTEM_CONFIG,
> > + { set_def_system_config, MGMT_SET_DEF_SYSTEM_CONFIG_SIZE,
> > HCI_MGMT_VAR_LEN },
>
> This was me being stupid. I had this fixed up in my tree, but forgot to amend the commit. I force pushed a correct commit to bluetooth-next now.
>
> Regards
>
> Marcel
>