Hi Johan, * johan.hedberg@xxxxxxxxx <johan.hedberg@xxxxxxxxx> [2011-04-28 11:29:04 -0700]: > From: Johan Hedberg <johan.hedberg@xxxxxxxxx> > > In some circumstances hci_get_auth_req will return a value different > from the current conn->auth_type. In these cases update conn->auth_type > so that when a user confirm request comes it doesn't falsely trigger > auto-accept. > > Signed-off-by: Johan Hedberg <johan.hedberg@xxxxxxxxx> > --- > net/bluetooth/hci_event.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c > index 8dfd386..f6219e2 100644 > --- a/net/bluetooth/hci_event.c > +++ b/net/bluetooth/hci_event.c > @@ -2447,7 +2447,8 @@ static inline void hci_io_capa_request_evt(struct hci_dev *hdev, struct sk_buff > > bacpy(&cp.bdaddr, &ev->bdaddr); > cp.capability = conn->io_capability; > - cp.authentication = hci_get_auth_req(conn); > + conn->auth_type = hci_get_auth_req(conn); > + cp.authentication = conn->auth_type; > > if ((conn->out == 0x01 || conn->remote_oob == 0x01) && > hci_find_remote_oob_data(hdev, &conn->dst)) All applied, thanks for fixes. -- Gustavo F. Padovan http://profusion.mobi -- To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
