[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <200809222150.m8MLocjD031863@imap1.linux-foundation.org>
Date: Mon, 22 Sep 2008 14:50:37 -0700
From: akpm@...ux-foundation.org
To: davem@...emloft.net
Cc: netdev@...r.kernel.org, akpm@...ux-foundation.org,
harvey.harrison@...il.com, tgraf@...g.ch
Subject: [patch 3/8] net: em_cmp.c use unaligned access helpers
From: Harvey Harrison <harvey.harrison@...il.com>
Signed-off-by: Harvey Harrison <harvey.harrison@...il.com>
Cc: Thomas Graf <tgraf@...g.ch>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
---
net/sched/em_cmp.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff -puN net/sched/em_cmp.c~net-em_cmpc-use-unaligned-access-helpers net/sched/em_cmp.c
--- a/net/sched/em_cmp.c~net-em_cmpc-use-unaligned-access-helpers
+++ a/net/sched/em_cmp.c
@@ -14,6 +14,7 @@
#include <linux/kernel.h>
#include <linux/skbuff.h>
#include <linux/tc_ematch/tc_em_cmp.h>
+#include <asm/unaligned.h>
#include <net/pkt_cls.h>
static inline int cmp_needs_transformation(struct tcf_em_cmp *cmp)
@@ -37,8 +38,7 @@ static int em_cmp_match(struct sk_buff *
break;
case TCF_EM_ALIGN_U16:
- val = *ptr << 8;
- val |= *(ptr+1);
+ val = get_unaligned_be16(ptr);
if (cmp_needs_transformation(cmp))
val = be16_to_cpu(val);
@@ -47,10 +47,7 @@ static int em_cmp_match(struct sk_buff *
case TCF_EM_ALIGN_U32:
/* Worth checking boundries? The branching seems
* to get worse. Visit again. */
- val = *ptr << 24;
- val |= *(ptr+1) << 16;
- val |= *(ptr+2) << 8;
- val |= *(ptr+3);
+ val = get_unaligned_be32(ptr);
if (cmp_needs_transformation(cmp))
val = be32_to_cpu(val);
_
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists