netfilter: Convert FWINV<[foo]> macros and uses to NF_INVF

[cascardo/linux.git] / net / bridge / netfilter / ebt_stp.c

diff --git a/net/bridge/netfilter/ebt_stp.c b/net/bridge/netfilter/ebt_stp.c
index 6b731e1..3140eb9 100644 (file)
--- a/net/bridge/netfilter/ebt_stp.c
+++ b/net/bridge/netfilter/ebt_stp.c
@@ -17,24 +17,24 @@
 #define BPDU_TYPE_TCN 0x80
 
 struct stp_header {
-       uint8_t dsap;
-       uint8_t ssap;
-       uint8_t ctrl;
-       uint8_t pid;
-       uint8_t vers;
-       uint8_t type;
+       u8 dsap;
+       u8 ssap;
+       u8 ctrl;
+       u8 pid;
+       u8 vers;
+       u8 type;
 };
 
 struct stp_config_pdu {
-       uint8_t flags;
-       uint8_t root[8];
-       uint8_t root_cost[4];
-       uint8_t sender[8];
-       uint8_t port[2];
-       uint8_t msg_age[2];
-       uint8_t max_age[2];
-       uint8_t hello_time[2];
-       uint8_t forward_delay[2];
+       u8 flags;
+       u8 root[8];
+       u8 root_cost[4];
+       u8 sender[8];
+       u8 port[2];
+       u8 msg_age[2];
+       u8 max_age[2];
+       u8 hello_time[2];
+       u8 forward_delay[2];
 };
 
 #define NR16(p) (p[0] << 8 | p[1])
@@ -44,76 +44,73 @@ static bool ebt_filter_config(const struct ebt_stp_info *info,
                              const struct stp_config_pdu *stpc)
 {
        const struct ebt_stp_config_info *c;
-       uint16_t v16;
-       uint32_t v32;
-       int verdict, i;
+       u16 v16;
+       u32 v32;
 
        c = &info->config;
        if ((info->bitmask & EBT_STP_FLAGS) &&
-           FWINV(c->flags != stpc->flags, EBT_STP_FLAGS))
+           NF_INVF(info, EBT_STP_FLAGS, c->flags != stpc->flags))
                return false;
        if (info->bitmask & EBT_STP_ROOTPRIO) {
                v16 = NR16(stpc->root);
-               if (FWINV(v16 < c->root_priol ||
-                   v16 > c->root_priou, EBT_STP_ROOTPRIO))
+               if (NF_INVF(info, EBT_STP_ROOTPRIO,
+                           v16 < c->root_priol || v16 > c->root_priou))
                        return false;
        }
        if (info->bitmask & EBT_STP_ROOTADDR) {
-               verdict = 0;
-               for (i = 0; i < 6; i++)
-                       verdict |= (stpc->root[2+i] ^ c->root_addr[i]) &
-                                  c->root_addrmsk[i];
-               if (FWINV(verdict != 0, EBT_STP_ROOTADDR))
+               if (NF_INVF(info, EBT_STP_ROOTADDR,
+                           !ether_addr_equal_masked(&stpc->root[2],
+                                                    c->root_addr,
+                                                    c->root_addrmsk)))
                        return false;
        }
        if (info->bitmask & EBT_STP_ROOTCOST) {
                v32 = NR32(stpc->root_cost);
-               if (FWINV(v32 < c->root_costl ||
-                   v32 > c->root_costu, EBT_STP_ROOTCOST))
+               if (NF_INVF(info, EBT_STP_ROOTCOST,
+                           v32 < c->root_costl || v32 > c->root_costu))
                        return false;
        }
        if (info->bitmask & EBT_STP_SENDERPRIO) {
                v16 = NR16(stpc->sender);
-               if (FWINV(v16 < c->sender_priol ||
-                   v16 > c->sender_priou, EBT_STP_SENDERPRIO))
+               if (NF_INVF(info, EBT_STP_SENDERPRIO,
+                           v16 < c->sender_priol || v16 > c->sender_priou))
                        return false;
        }
        if (info->bitmask & EBT_STP_SENDERADDR) {
-               verdict = 0;
-               for (i = 0; i < 6; i++)
-                       verdict |= (stpc->sender[2+i] ^ c->sender_addr[i]) &
-                                  c->sender_addrmsk[i];
-               if (FWINV(verdict != 0, EBT_STP_SENDERADDR))
+               if (NF_INVF(info, EBT_STP_SENDERADDR,
+                           !ether_addr_equal_masked(&stpc->sender[2],
+                                                    c->sender_addr,
+                                                    c->sender_addrmsk)))
                        return false;
        }
        if (info->bitmask & EBT_STP_PORT) {
                v16 = NR16(stpc->port);
-               if (FWINV(v16 < c->portl ||
-                   v16 > c->portu, EBT_STP_PORT))
+               if (NF_INVF(info, EBT_STP_PORT,
+                           v16 < c->portl || v16 > c->portu))
                        return false;
        }
        if (info->bitmask & EBT_STP_MSGAGE) {
                v16 = NR16(stpc->msg_age);
-               if (FWINV(v16 < c->msg_agel ||
-                   v16 > c->msg_ageu, EBT_STP_MSGAGE))
+               if (NF_INVF(info, EBT_STP_MSGAGE,
+                           v16 < c->msg_agel || v16 > c->msg_ageu))
                        return false;
        }
        if (info->bitmask & EBT_STP_MAXAGE) {
                v16 = NR16(stpc->max_age);
-               if (FWINV(v16 < c->max_agel ||
-                   v16 > c->max_ageu, EBT_STP_MAXAGE))
+               if (NF_INVF(info, EBT_STP_MAXAGE,
+                           v16 < c->max_agel || v16 > c->max_ageu))
                        return false;
        }
        if (info->bitmask & EBT_STP_HELLOTIME) {
                v16 = NR16(stpc->hello_time);
-               if (FWINV(v16 < c->hello_timel ||
-                   v16 > c->hello_timeu, EBT_STP_HELLOTIME))
+               if (NF_INVF(info, EBT_STP_HELLOTIME,
+                           v16 < c->hello_timel || v16 > c->hello_timeu))
                        return false;
        }
        if (info->bitmask & EBT_STP_FWDD) {
                v16 = NR16(stpc->forward_delay);
-               if (FWINV(v16 < c->forward_delayl ||
-                   v16 > c->forward_delayu, EBT_STP_FWDD))
+               if (NF_INVF(info, EBT_STP_FWDD,
+                           v16 < c->forward_delayl || v16 > c->forward_delayu))
                        return false;
        }
        return true;
@@ -125,7 +122,7 @@ ebt_stp_mt(const struct sk_buff *skb, struct xt_action_param *par)
        const struct ebt_stp_info *info = par->matchinfo;
        const struct stp_header *sp;
        struct stp_header _stph;
-       const uint8_t header[6] = {0x42, 0x42, 0x03, 0x00, 0x00, 0x00};
+       const u8 header[6] = {0x42, 0x42, 0x03, 0x00, 0x00, 0x00};
 
        sp = skb_header_pointer(skb, 0, sizeof(_stph), &_stph);
        if (sp == NULL)
@@ -135,8 +132,8 @@ ebt_stp_mt(const struct sk_buff *skb, struct xt_action_param *par)
        if (memcmp(sp, header, sizeof(header)))
                return false;
 
-       if (info->bitmask & EBT_STP_TYPE &&
-           FWINV(info->type != sp->type, EBT_STP_TYPE))
+       if ((info->bitmask & EBT_STP_TYPE) &&
+           NF_INVF(info, EBT_STP_TYPE, info->type != sp->type))
                return false;
 
        if (sp->type == BPDU_TYPE_CONFIG &&
@@ -156,8 +153,8 @@ ebt_stp_mt(const struct sk_buff *skb, struct xt_action_param *par)
 static int ebt_stp_mt_check(const struct xt_mtchk_param *par)
 {
        const struct ebt_stp_info *info = par->matchinfo;
-       const uint8_t bridge_ula[6] = {0x01, 0x80, 0xc2, 0x00, 0x00, 0x00};
-       const uint8_t msk[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+       const u8 bridge_ula[6] = {0x01, 0x80, 0xc2, 0x00, 0x00, 0x00};
+       const u8 msk[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
        const struct ebt_entry *e = par->entryinfo;
 
        if (info->bitmask & ~EBT_STP_MASK || info->invflags & ~EBT_STP_MASK ||