NFC: Set the right LLCP N(R) value for I frames

Samuel Ortiz · linvjw · commit 0767a7fa87ff · 2012-03-06T15:16:21.000-05:00
Signed-off-by: Samuel Ortiz &lt;sameo@linux.intel.com&gt;
Signed-off-by: John W. Linville &lt;linville@tuxdriver.com&gt;
diff --git a/net/nfc/llcp/llcp.c b/net/nfc/llcp/llcp.c
@@ -419,7 +419,7 @@ static u8 nfc_llcp_nr(struct sk_buff *pdu)
 
 static void nfc_llcp_set_nrns(struct nfc_llcp_sock *sock, struct sk_buff *pdu)
 {
-	pdu->data[2] = (sock->send_n << 4) | ((sock->recv_n - 1) % 16);
+	pdu->data[2] = (sock->send_n << 4) | (sock->recv_n % 16);
 	sock->send_n = (sock->send_n + 1) % 16;
 	sock->recv_ack_n = (sock->recv_n - 1) % 16;
 }

Original file line number	Diff line number	Diff line change
`@@ -419,7 +419,7 @@ static u8 nfc_llcp_nr(struct sk_buff *pdu)`
`419`	`419`
`420`	`420`	`static void nfc_llcp_set_nrns(struct nfc_llcp_sock sock, struct sk_buff pdu)`
`421`	`421`	`{`
`422`		`- pdu->data[2] = (sock->send_n << 4) \| ((sock->recv_n - 1) % 16);`
	`422`	`+ pdu->data[2] = (sock->send_n << 4) \| (sock->recv_n % 16);`
`423`	`423`	`sock->send_n = (sock->send_n + 1) % 16;`
`424`	`424`	`sock->recv_ack_n = (sock->recv_n - 1) % 16;`
`425`	`425`	`}`