mmc-omap: add support for 16-bit and 32-bit registers

[safe/jmp/linux-2.6] / net / sched / em_cmp.c

diff --git a/net/sched/em_cmp.c b/net/sched/em_cmp.c
index bf1f00f..bc45039 100644 (file)
--- a/net/sched/em_cmp.c
+++ b/net/sched/em_cmp.c
@@ -9,12 +9,12 @@
  * Authors:    Thomas Graf <tgraf@suug.ch>
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #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)
@@ -38,8 +38,7 @@ static int em_cmp_match(struct sk_buff *skb, struct tcf_ematch *em,
                        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);
@@ -48,10 +47,7 @@ static int em_cmp_match(struct sk_buff *skb, struct tcf_ematch *em,
                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);
@@ -89,7 +85,7 @@ static int __init init_em_cmp(void)
        return tcf_em_register(&em_cmp_ops);
 }
 
-static void __exit exit_em_cmp(void) 
+static void __exit exit_em_cmp(void)
 {
        tcf_em_unregister(&em_cmp_ops);
 }
@@ -99,3 +95,4 @@ MODULE_LICENSE("GPL");
 module_init(init_em_cmp);
 module_exit(exit_em_cmp);
 
+MODULE_ALIAS_TCF_EMATCH(TCF_EM_CMP);