Merge git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-drm-fsl-dcu.git] / net / sched / em_u32.c

diff --git a/net/sched/em_u32.c b/net/sched/em_u32.c
index 34e7e51e601e0f3e4baec3e5e1dba4ec1a0e8841..cd0600c6796984b955d26f4b5cc65e46aba8c4e6 100644 (file)
--- a/net/sched/em_u32.c
+++ b/net/sched/em_u32.c
@@ -12,7 +12,6 @@
  * Based on net/sched/cls_u32.c
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
@@ -24,7 +23,7 @@ static int em_u32_match(struct sk_buff *skb, struct tcf_ematch *em,
 {
        struct tc_u32_key *key = (struct tc_u32_key *) em->data;
        unsigned char *ptr = skb->nh.raw;
-       
+
        if (info) {
                if (info->ptr)
                        ptr = info->ptr;
@@ -35,7 +34,7 @@ static int em_u32_match(struct sk_buff *skb, struct tcf_ematch *em,
 
        if (!tcf_valid_offset(skb, ptr, sizeof(u32)))
                return 0;
-       
+
        return !(((*(u32*) ptr)  ^ key->val) & key->mask);
 }
 
@@ -52,7 +51,7 @@ static int __init init_em_u32(void)
        return tcf_em_register(&em_u32_ops);
 }
 
-static void __exit exit_em_u32(void) 
+static void __exit exit_em_u32(void)
 {
        tcf_em_unregister(&em_u32_ops);
 }