summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2012-03-05 01:03:41 +0100
committerJohn W. Linville <linville@tuxdriver.com>2012-03-06 15:16:21 -0500
commit0767a7fa87ff18f6a11e3de954c5386a45b9d96e (patch)
treeb2c2a3251cff14e90d7187c34d9818885d89d37d
parentb9a76f1d3c6da47b2fa115ff1c0de229e8d06f8f (diff)
downloadlinux-stable-0767a7fa87ff18f6a11e3de954c5386a45b9d96e.tar.gz
linux-stable-0767a7fa87ff18f6a11e3de954c5386a45b9d96e.tar.bz2
linux-stable-0767a7fa87ff18f6a11e3de954c5386a45b9d96e.zip
NFC: Set the right LLCP N(R) value for I frames
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--net/nfc/llcp/llcp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/nfc/llcp/llcp.c b/net/nfc/llcp/llcp.c
index 577bcb92ea9b..2506810cd780 100644
--- 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;
}