aboutsummaryrefslogtreecommitdiff
path: root/net/sched/em_u32.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/sched/em_u32.c')
-rw-r--r--net/sched/em_u32.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/net/sched/em_u32.c b/net/sched/em_u32.c
index 34e7e51e601..797bdb88c01 100644
--- 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>
@@ -23,8 +22,8 @@ static int em_u32_match(struct sk_buff *skb, struct tcf_ematch *em,
struct tcf_pkt_info *info)
{
struct tc_u32_key *key = (struct tc_u32_key *) em->data;
- unsigned char *ptr = skb->nh.raw;
-
+ const unsigned char *ptr = skb_network_header(skb);
+
if (info) {
if (info->ptr)
ptr = info->ptr;
@@ -35,8 +34,8 @@ 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);
+
+ return !(((*(__be32 *) ptr) ^ key->val) & key->mask);
}
static struct tcf_ematch_ops em_u32_ops = {
@@ -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);
}
@@ -61,3 +60,5 @@ MODULE_LICENSE("GPL");
module_init(init_em_u32);
module_exit(exit_em_u32);
+
+MODULE_ALIAS_TCF_EMATCH(TCF_EM_U32);