Commit 22953f93 authored Sep 23, 2013 by Olivier Guiter Committed by Samuel Ortiz Sep 25, 2013

NFC: pn533: Add MI/TG bits only when in Initiator mode



The fragmentation routine (used to split big frames) could be used in
target or initiator mode (TgSetMetaData vs InDataExchange), but the
MI/TG bytes are not needed in target mode (TgSetMetaData), so we
add a check on the mode

Signed-off-by: Olivier Guiter <olivier.guiter@linux.intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

parent 2bed2785

drivers/nfc/pn533.c

+11 −8

Original line number	Diff line number	Diff line
		@@ -2504,14 +2504,17 @@ static int pn533_fill_fragment_skbs(struct pn533 dev, struct sk_buff skb)
		break;
		}

		if (!dev->tgt_mode) {
		/* Reserve the TG/MI byte */
		skb_reserve(frag, 1);

		/* MI + TG */
		if (frag_size == PN533_CMD_DATAFRAME_MAXLEN)
		*skb_push(frag, sizeof(u8)) = (PN533_CMD_MI_MASK \| 1);
		*skb_push(frag, sizeof(u8)) =
		(PN533_CMD_MI_MASK \| 1);
		else
		skb_push(frag, sizeof(u8)) = 1; / TG */
		}

		memcpy(skb_put(frag, frag_size), skb->data, frag_size);