X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fsched%2Fem_u32.c;h=953f1479f7da2d4af4015440fc708ffda9d81670;hb=ad619800e4e034cad44299b2a22df9eebb043ac3;hp=e3ddfce0ac8d9b28e7eee8d49c1f35920932363f;hpb=ba290ab7dace8b3339c0cc86c221d48eed21e956;p=linux-2.6

diff --git a/net/sched/em_u32.c b/net/sched/em_u32.c
index e3ddfce0ac..953f1479f7 100644
--- a/net/sched/em_u32.c
+++ b/net/sched/em_u32.c
@@ -22,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;
@@ -34,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 = {
@@ -51,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);
 }
@@ -60,3 +60,5 @@ MODULE_LICENSE("GPL");
 
 module_init(init_em_u32);
 module_exit(exit_em_u32);
+
+MODULE_ALIAS_TCF_EMATCH(TCF_EM_U32);