NFC: hci: Change event_received handler gate parameter to pipe

Several pipes may point to the same CLF gate, so getting the gate ID
as an input is not enough.
For example dual secure element may have 2 pipes (1 for uicc and
1 for eSE) pointing to the connectivity gate.

As resolving gate and host IDs can be done from a pipe, we now pass
the pipe ID to the event received handler.

Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/include/net/nfc/hci.h b/include/net/nfc/hci.h
index 14bd0e1c47fae31ba0ae70669dde92741a81cc64..031c0be9fb32892456a173c878d84c3ef1859c1a 100644 (file)
--- a/include/net/nfc/hci.h
+++ b/include/net/nfc/hci.h
@@ -51,7 +51,7 @@ struct nfc_hci_ops {
        int (*tm_send)(struct nfc_hci_dev *hdev, struct sk_buff *skb);
        int (*check_presence)(struct nfc_hci_dev *hdev,
                              struct nfc_target *target);
-       int (*event_received)(struct nfc_hci_dev *hdev, u8 gate, u8 event,
+       int (*event_received)(struct nfc_hci_dev *hdev, u8 pipe, u8 event,
                              struct sk_buff *skb);
        int (*fw_download)(struct nfc_hci_dev *hdev, const char *firmware_name);
        int (*discover_se)(struct nfc_hci_dev *dev);

diff --git a/net/nfc/hci/core.c b/net/nfc/hci/core.c
index ef50e7716c4a8742840731db126351fee16bc57b..12a9a4b956d2b391dd67536b4d86e05097643e45 100644 (file)
--- a/net/nfc/hci/core.c
+++ b/net/nfc/hci/core.c
@@ -338,7 +338,7 @@ void nfc_hci_event_received(struct nfc_hci_dev *hdev, u8 pipe, u8 event,
        }
 
        if (hdev->ops->event_received) {
-               r = hdev->ops->event_received(hdev, gate, event, skb);
+               r = hdev->ops->event_received(hdev, pipe, event, skb);
                if (r <= 0)
                        goto exit_noskb;
        }