2012-01-08 09:19:53

by ilanelias78

Subject: [PATCH] NFC: Complete NCI deactivate in deactivate_ntf

From: Ilan Elias <[email protected]>

If a target was active, complete the NCI deactivate request
only in deactivate_ntf. Otherwise, complete it at deactivate_rsp.
Deactivate_ntf represents the actual disconnection event (sent from
the NCI controller).

Signed-off-by: Ilan Elias <[email protected]>
---
net/nfc/nci/ntf.c | 2 ++
net/nfc/nci/rsp.c | 5 ++++-
2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/net/nfc/nci/ntf.c b/net/nfc/nci/ntf.c
index 5b2b013..a88be91 100644
--- a/net/nfc/nci/ntf.c
+++ b/net/nfc/nci/ntf.c
@@ -365,6 +365,8 @@ static void nci_rf_deactivate_ntf_packet(struct nci_dev *ndev,
/* complete the data exchange transaction, if exists */
if (test_bit(NCI_DATA_EXCHANGE, &ndev->flags))
nci_data_exchange_complete(ndev, NULL, -EIO);
+
+ nci_req_complete(ndev, NCI_STATUS_OK);
}

void nci_ntf_packet(struct nci_dev *ndev, struct sk_buff *skb)
diff --git a/net/nfc/nci/rsp.c b/net/nfc/nci/rsp.c
index 2840ae2..3c73e92 100644
--- a/net/nfc/nci/rsp.c
+++ b/net/nfc/nci/rsp.c
@@ -151,7 +151,10 @@ static void nci_rf_deactivate_rsp_packet(struct nci_dev *ndev,

clear_bit(NCI_DISCOVERY, &ndev->flags);

- nci_req_complete(ndev, status);
+ /* If target was active, complete the request only in deactivate_ntf */
+ if ((status != NCI_STATUS_OK) ||
+ (!test_bit(NCI_POLL_ACTIVE, &ndev->flags)))
+ nci_req_complete(ndev, status);
}

void nci_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb)
--
1.7.0.4

2012-01-16 17:57:43

by Samuel Ortiz

Subject: Re: [PATCH] NFC: Complete NCI deactivate in deactivate_ntf

On Sun, 2012-01-08 at 11:21 +0200, [email protected] wrote:
> From: Ilan Elias <[email protected]>
>
> If a target was active, complete the NCI deactivate request
> only in deactivate_ntf. Otherwise, complete it at deactivate_rsp.
> Deactivate_ntf represents the actual disconnection event (sent from
> the NCI controller).
>
> Signed-off-by: Ilan Elias <[email protected]>
Acked-by: Samuel Ortiz <[email protected]>

Cheers,
Samuel.