| Message ID | 20200612193358.203186-1-alainm@chromium.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | bluetooth: Fix op_code size entry from the previous patch | expand |
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 <alainm@chromium.org> > --- > > 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
OK, thanks! On Fri, Jun 12, 2020 at 3:42 PM Marcel Holtmann <marcel@holtmann.org> 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 <alainm@chromium.org> > > --- > > > > 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 >
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 }, };
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 <alainm@chromium.org> --- net/bluetooth/mgmt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)