NFC: Clearly separate NCI states from flags

[deliverable/linux.git] / net / nfc / nci / ntf.c

diff --git a/net/nfc/nci/ntf.c b/net/nfc/nci/ntf.c
index a88be91e973f66a868a9b2382868cd7473a49392..8ec39464cea52b07f4f00ca11f97aabc9ec45c2a 100644 (file)
--- a/net/nfc/nci/ntf.c
+++ b/net/nfc/nci/ntf.c
@@ -261,8 +261,7 @@ static void nci_rf_intf_activated_ntf_packet(struct nci_dev *ndev,
        __u8 *data = skb->data;
        int err = 0;
 
-       clear_bit(NCI_DISCOVERY, &ndev->flags);
-       set_bit(NCI_POLL_ACTIVE, &ndev->flags);
+       atomic_set(&ndev->state, NCI_POLL_ACTIVE);
 
        ntf.rf_discovery_id = *data++;
        ntf.rf_interface = *data++;
@@ -350,7 +349,7 @@ static void nci_rf_deactivate_ntf_packet(struct nci_dev *ndev,
 
        pr_debug("entry, type 0x%x, reason 0x%x\n", ntf->type, ntf->reason);
 
-       clear_bit(NCI_POLL_ACTIVE, &ndev->flags);
+       atomic_set(&ndev->state, NCI_IDLE);
        ndev->target_active_prot = 0;
 
        /* drop tx data queue */