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

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

diff --git a/net/bridge/netfilter/ebt_stp.c b/net/bridge/netfilter/ebt_stp.c
index a0bed82145eda9fcb02d88d8a7edb1a6e577f922..31b77367319cb3949e5c9f61f27ce3c184225067 100644 (file)
--- a/net/bridge/netfilter/ebt_stp.c
+++ b/net/bridge/netfilter/ebt_stp.c
@@ -62,7 +62,7 @@ static int ebt_filter_config(struct ebt_stp_info *info,
                verdict = 0;
                for (i = 0; i < 6; i++)
                        verdict |= (stpc->root[2+i] ^ c->root_addr[i]) &
-                                  c->root_addrmsk[i];
+                                  c->root_addrmsk[i];
                if (FWINV(verdict != 0, EBT_STP_ROOTADDR))
                        return EBT_NOMATCH;
        }
@@ -82,7 +82,7 @@ static int ebt_filter_config(struct ebt_stp_info *info,
                verdict = 0;
                for (i = 0; i < 6; i++)
                        verdict |= (stpc->sender[2+i] ^ c->sender_addr[i]) &
-                                  c->sender_addrmsk[i];
+                                  c->sender_addrmsk[i];
                if (FWINV(verdict != 0, EBT_STP_SENDERADDR))
                        return EBT_NOMATCH;
        }