From ccd086c7d362f126547b35fe01167bba5c0e6af0 Mon Sep 17 00:00:00 2001 From: Harvey Harrison Date: Fri, 2 May 2008 16:21:52 -0700 Subject: [PATCH] --- yaml --- r: 95893 b: refs/heads/master c: 260ffeed3fd185d29f08e98fb47c09e71bb59cd8 h: refs/heads/master i: 95891: 30d2eb5f4d97337440b6b6019ba917e99628c5c1 v: v3 --- [refs] | 2 +- trunk/net/irda/iriap.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 06f3c3d9d833..4c055259f0f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b4192bbd85d29eb3bec7f9297d6464250e6a7a90 +refs/heads/master: 260ffeed3fd185d29f08e98fb47c09e71bb59cd8 diff --git a/trunk/net/irda/iriap.c b/trunk/net/irda/iriap.c index 9e15c82960fe..4a105dc32dcd 100644 --- a/trunk/net/irda/iriap.c +++ b/trunk/net/irda/iriap.c @@ -451,12 +451,14 @@ static void iriap_getvaluebyclass_confirm(struct iriap_cb *self, n = 2; /* Get length, MSB first */ - len = be16_to_cpu(get_unaligned((__be16 *)(fp+n))); n += 2; + len = get_unaligned_be16(fp + n); + n += 2; IRDA_DEBUG(4, "%s(), len=%d\n", __func__, len); /* Get object ID, MSB first */ - obj_id = be16_to_cpu(get_unaligned((__be16 *)(fp+n))); n += 2; + obj_id = get_unaligned_be16(fp + n); + n += 2; type = fp[n++]; IRDA_DEBUG(4, "%s(), Value type = %d\n", __func__, type); @@ -506,7 +508,7 @@ static void iriap_getvaluebyclass_confirm(struct iriap_cb *self, value = irias_new_string_value(fp+n); break; case IAS_OCT_SEQ: - value_len = be16_to_cpu(get_unaligned((__be16 *)(fp+n))); + value_len = get_unaligned_be16(fp + n); n += 2; /* Will truncate to IAS_MAX_OCTET_STRING bytes */