diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2012-05-14 17:38:54 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-06-04 21:34:29 +0200 |
| commit | 76762b73693aa7621ae8d3ea5c7efbf74beda0b9 (patch) | |
| tree | 7298416cb60294988e6c9928f5da43f0b99c0c79 /net/nfc | |
| parent | 93d7e490b7f4a72b6c7e1dfa475fa3c3e18eb9f1 (diff) | |
| download | linux-stable-76762b73693aa7621ae8d3ea5c7efbf74beda0b9.tar.gz linux-stable-76762b73693aa7621ae8d3ea5c7efbf74beda0b9.tar.bz2 linux-stable-76762b73693aa7621ae8d3ea5c7efbf74beda0b9.zip | |
NFC: LLCP's MIUX is 10 bytes long, not 7
The mask is 0x7ff and not 0x7f and the return value is an u16.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc')
| -rw-r--r-- | net/nfc/llcp/commands.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/nfc/llcp/commands.c b/net/nfc/llcp/commands.c index 850e5cf79378..b982b5b890d7 100644 --- a/net/nfc/llcp/commands.c +++ b/net/nfc/llcp/commands.c @@ -51,7 +51,7 @@ static u8 llcp_tlv8(u8 *tlv, u8 type) return tlv[2]; } -static u8 llcp_tlv16(u8 *tlv, u8 type) +static u16 llcp_tlv16(u8 *tlv, u8 type) { if (tlv[0] != type || tlv[1] != llcp_tlv_length[tlv[0]]) return 0; @@ -67,7 +67,7 @@ static u8 llcp_tlv_version(u8 *tlv) static u16 llcp_tlv_miux(u8 *tlv) { - return llcp_tlv16(tlv, LLCP_TLV_MIUX) & 0x7f; + return llcp_tlv16(tlv, LLCP_TLV_MIUX) & 0x7ff; } static u16 llcp_tlv_wks(u8 *tlv) |