Re: [v4.4/bluetooth PATCH 1/3] Bluetooth: Consolidate encryption handling in hci_encrypt_cfm

[Greg KH]

On Fri, Oct 16, 2020 at 07:46:39AM +0000, Hans-Christian Egtvedt (hegtvedt) wrote:
> On 16/10/2020 09:32, Greg KH wrote:
> > On Thu, Oct 15, 2020 at 11:12:23PM +0200, Hans-Christian Noren Egtvedt wrote:
> >> From: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>
> >>
> >> This makes hci_encrypt_cfm calls hci_connect_cfm in case the connection
> >> state is BT_CONFIG so callers don't have to check the state.
> >>
> >> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>
> >> Signed-off-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
> >> (cherry picked from commit 3ca44c16b0dcc764b641ee4ac226909f5c421aa3)
> >> Cc: stable@xxxxxxxxxxxxxxx # 4.4
> >> ---
> >>  include/net/bluetooth/hci_core.h | 20 ++++++++++++++++++--
> >>  net/bluetooth/hci_event.c        | 28 +++-------------------------
> >>  2 files changed, 21 insertions(+), 27 deletions(-)
> > 
> > What differs here from the other patch series you sent?  Looks the same
> > to me...
> 
> Patch 1 and 2 in this series is identical, patch 3/3 is adjusted to
> resolve a conflict. Sorry I did not make that clearer.

No problem, thanks for confirming this, that makes me feel better that I
didn't miss anything.

greg k-h