Pull bugfix into test branch

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

diff --git a/net/bridge/netfilter/ebt_mark_m.c b/net/bridge/netfilter/ebt_mark_m.c
index a6413e4b49822aeb36d538e4f09c66be75c9cc59..025869ee0b68945b11d1331d6886123adbdd09dd 100644 (file)
--- a/net/bridge/netfilter/ebt_mark_m.c
+++ b/net/bridge/netfilter/ebt_mark_m.c
@@ -19,8 +19,8 @@ static int ebt_filter_mark(const struct sk_buff *skb,
        struct ebt_mark_m_info *info = (struct ebt_mark_m_info *) data;
 
        if (info->bitmask & EBT_MARK_OR)
-               return !(!!(skb->nfmark & info->mask) ^ info->invert);
-       return !(((skb->nfmark & info->mask) == info->mark) ^ info->invert);
+               return !(!!(skb->mark & info->mask) ^ info->invert);
+       return !(((skb->mark & info->mask) == info->mark) ^ info->invert);
 }
 
 static int ebt_mark_check(const char *tablename, unsigned int hookmask,