Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / net / netfilter / xt_CONNMARK.c

diff --git a/net/netfilter/xt_CONNMARK.c b/net/netfilter/xt_CONNMARK.c
index 5a00c5444334fe926bd2a8bc995493c1bea574a0..8cc324b159e9b30d55b735eb9ae377df2a0b193e 100644 (file)
--- a/net/netfilter/xt_CONNMARK.c
+++ b/net/netfilter/xt_CONNMARK.c
@@ -27,13 +27,14 @@ MODULE_AUTHOR("Henrik Nordstrom <hno@marasytems.com>");
 MODULE_DESCRIPTION("IP tables CONNMARK matching module");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("ipt_CONNMARK");
+MODULE_ALIAS("ip6t_CONNMARK");
 
 #include <linux/netfilter/x_tables.h>
 #include <linux/netfilter/xt_CONNMARK.h>
 #include <net/netfilter/nf_conntrack_ecache.h>
 
 static unsigned int
-target(struct sk_buff **pskb,
+target(struct sk_buff *skb,
        const struct net_device *in,
        const struct net_device *out,
        unsigned int hooknum,
@@ -47,28 +48,28 @@ target(struct sk_buff **pskb,
        u_int32_t mark;
        u_int32_t newmark;
 
-       ct = nf_ct_get(*pskb, &ctinfo);
+       ct = nf_ct_get(skb, &ctinfo);
        if (ct) {
                switch(markinfo->mode) {
                case XT_CONNMARK_SET:
                        newmark = (ct->mark & ~markinfo->mask) | markinfo->mark;
                        if (newmark != ct->mark) {
                                ct->mark = newmark;
-                               nf_conntrack_event_cache(IPCT_MARK, *pskb);
+                               nf_conntrack_event_cache(IPCT_MARK, skb);
                        }
                        break;
                case XT_CONNMARK_SAVE:
                        newmark = (ct->mark & ~markinfo->mask) |
-                                 ((*pskb)->mark & markinfo->mask);
+                                 (skb->mark & markinfo->mask);
                        if (ct->mark != newmark) {
                                ct->mark = newmark;
-                               nf_conntrack_event_cache(IPCT_MARK, *pskb);
+                               nf_conntrack_event_cache(IPCT_MARK, skb);
                        }
                        break;
                case XT_CONNMARK_RESTORE:
-                       mark = (*pskb)->mark;
+                       mark = skb->mark;
                        diff = (ct->mark ^ mark) & markinfo->mask;
-                       (*pskb)->mark = mark ^ diff;
+                       skb->mark = mark ^ diff;
                        break;
                }
        }