Patch "NFC: nci: extract pipe value using NCI_HCP_MSG_GET_PIPE" has been added to the 4.1-stable tree

This is a note to let you know that I've just added the patch titled

NFC: nci: extract pipe value using NCI_HCP_MSG_GET_PIPE

to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
nfc-nci-extract-pipe-value-using-nci_hcp_msg_get_pipe.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Christophe Ricard <[email protected]>
Date: Sun, 25 Oct 2015 22:54:22 +0100
Subject: NFC: nci: extract pipe value using NCI_HCP_MSG_GET_PIPE

From: Christophe Ricard <[email protected]>

commit e65917b6d54f8b47d8293ea96adfa604fd46cf0d upstream.

When receiving data in nci_hci_msg_rx_work, extract pipe value using NCI_HCP_MSG_GET_PIPE macro.

---
 net/nfc/nci/hci.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

@@ -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;

Patches currently in stable-queue which might be from [email protected] are

queue-4.1/nfc-nci-extract-pipe-value-using-nci_hcp_msg_get_pipe.patch queue-4.1/nfc-nci-fix-incorrect-data-chaining-when-sending-data.patch queue-4.1/nfc-nci-fix-improper-management-of-hci-return-code.patch