Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus

1 files changed, 2 insertions, 1 deletions

diff --git a/net/sched/cls_fw.c b/net/sched/cls_fw.c
index f59a2c4aa039..c797d6ada7de 100644
--- a/net/sched/cls_fw.c
+++ b/net/sched/cls_fw.c
@@ -101,9 +101,10 @@ static int fw_classify(struct sk_buff *skb, struct tcf_proto *tp,
         struct fw_head *head = (struct fw_head*)tp->root;
         struct fw_filter *f;
         int r;
-        u32 id = skb->mark & head->mask;
+        u32 id = skb->mark;
 
         if (head != NULL) {
+                id &= head->mask;
                 for (f=head->ht[fw_hash(id)]; f; f=f->next) {
                         if (f->id == id) {
                                 *res = f->res;