From patchwork Mon Sep 22 21:50:37 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [3/8] net: em_cmp.c use unaligned access helpers Date: Mon, 22 Sep 2008 11:50:37 -0000 From: Andrew Morton X-Patchwork-Id: 969 Message-Id: <200809222150.m8MLocjD031863@imap1.linux-foundation.org> To: davem@davemloft.net Cc: netdev@vger.kernel.org, akpm@linux-foundation.org, harvey.harrison@gmail.com, tgraf@suug.ch From: Harvey Harrison Signed-off-by: Harvey Harrison Cc: Thomas Graf Signed-off-by: Andrew Morton --- 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 #include #include +#include #include 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);