| From e65917b6d54f8b47d8293ea96adfa604fd46cf0d Mon Sep 17 00:00:00 2001 |
| From: Christophe Ricard <christophe.ricard@gmail.com> |
| Date: Sun, 25 Oct 2015 22:54:22 +0100 |
| Subject: NFC: nci: extract pipe value using NCI_HCP_MSG_GET_PIPE |
| |
| From: Christophe Ricard <christophe.ricard@gmail.com> |
| |
| commit e65917b6d54f8b47d8293ea96adfa604fd46cf0d upstream. |
| |
| When receiving data in nci_hci_msg_rx_work, extract pipe |
| value using NCI_HCP_MSG_GET_PIPE macro. |
| |
| Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> |
| Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| net/nfc/nci/hci.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/net/nfc/nci/hci.c |
| +++ b/net/nfc/nci/hci.c |
| @@ -402,7 +402,7 @@ static void nci_hci_msg_rx_work(struct w |
| u8 pipe, type, instruction; |
| |
| while ((skb = skb_dequeue(&hdev->msg_rx_queue)) != NULL) { |
| - pipe = skb->data[0]; |
| + pipe = NCI_HCP_MSG_GET_PIPE(skb->data[0]); |
| skb_pull(skb, NCI_HCI_HCP_PACKET_HEADER_LEN); |
| message = (struct nci_hcp_message *)skb->data; |
| type = NCI_HCP_MSG_GET_TYPE(message->header); |
| @@ -439,7 +439,7 @@ void nci_hci_data_received_cb(void *cont |
| |
| /* it's the last fragment. Does it need re-aggregation? */ |
| if (skb_queue_len(&ndev->hci_dev->rx_hcp_frags)) { |
| - pipe = packet->header & NCI_HCI_FRAGMENT; |
| + pipe = NCI_HCP_MSG_GET_PIPE(packet->header); |
| skb_queue_tail(&ndev->hci_dev->rx_hcp_frags, skb); |
| |
| msg_len = 0; |
