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

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

diff --git a/net/bridge/netfilter/ebt_arp.c b/net/bridge/netfilter/ebt_arp.c
index cca0a89..2271422 100644 (file)
--- a/net/bridge/netfilter/ebt_arp.c
+++ b/net/bridge/netfilter/ebt_arp.c
@@ -25,14 +25,14 @@ ebt_arp_mt(const struct sk_buff *skb, struct xt_action_param *par)
        ah = skb_header_pointer(skb, 0, sizeof(_arph), &_arph);
        if (ah == NULL)
                return false;
-       if (info->bitmask & EBT_ARP_OPCODE && FWINV(info->opcode !=
-          ah->ar_op, EBT_ARP_OPCODE))
+       if ((info->bitmask & EBT_ARP_OPCODE) &&
+           NF_INVF(info, EBT_ARP_OPCODE, info->opcode != ah->ar_op))
                return false;
-       if (info->bitmask & EBT_ARP_HTYPE && FWINV(info->htype !=
-          ah->ar_hrd, EBT_ARP_HTYPE))
+       if ((info->bitmask & EBT_ARP_HTYPE) &&
+           NF_INVF(info, EBT_ARP_HTYPE, info->htype != ah->ar_hrd))
                return false;
-       if (info->bitmask & EBT_ARP_PTYPE && FWINV(info->ptype !=
-          ah->ar_pro, EBT_ARP_PTYPE))
+       if ((info->bitmask & EBT_ARP_PTYPE) &&
+           NF_INVF(info, EBT_ARP_PTYPE, info->ptype != ah->ar_pro))
                return false;
 
        if (info->bitmask & (EBT_ARP_SRC_IP | EBT_ARP_DST_IP | EBT_ARP_GRAT)) {
@@ -51,14 +51,16 @@ ebt_arp_mt(const struct sk_buff *skb, struct xt_action_param *par)
                                        sizeof(daddr), &daddr);
                if (dap == NULL)
                        return false;
-               if (info->bitmask & EBT_ARP_SRC_IP &&
-                   FWINV(info->saddr != (*sap & info->smsk), EBT_ARP_SRC_IP))
+               if ((info->bitmask & EBT_ARP_SRC_IP) &&
+                   NF_INVF(info, EBT_ARP_SRC_IP,
+                           info->saddr != (*sap & info->smsk)))
                        return false;
-               if (info->bitmask & EBT_ARP_DST_IP &&
-                   FWINV(info->daddr != (*dap & info->dmsk), EBT_ARP_DST_IP))
+               if ((info->bitmask & EBT_ARP_DST_IP) &&
+                   NF_INVF(info, EBT_ARP_DST_IP,
+                           info->daddr != (*dap & info->dmsk)))
                        return false;
-               if (info->bitmask & EBT_ARP_GRAT &&
-                   FWINV(*dap != *sap, EBT_ARP_GRAT))
+               if ((info->bitmask & EBT_ARP_GRAT) &&
+                   NF_INVF(info, EBT_ARP_GRAT, *dap != *sap))
                        return false;
        }
 
@@ -73,9 +75,9 @@ ebt_arp_mt(const struct sk_buff *skb, struct xt_action_param *par)
                                                sizeof(_mac), &_mac);
                        if (mp == NULL)
                                return false;
-                       if (FWINV(!ether_addr_equal_masked(mp, info->smaddr,
-                                                          info->smmsk),
-                                 EBT_ARP_SRC_MAC))
+                       if (NF_INVF(info, EBT_ARP_SRC_MAC,
+                                   !ether_addr_equal_masked(mp, info->smaddr,
+                                                            info->smmsk)))
                                return false;
                }
 
@@ -85,9 +87,9 @@ ebt_arp_mt(const struct sk_buff *skb, struct xt_action_param *par)
                                                sizeof(_mac), &_mac);
                        if (mp == NULL)
                                return false;
-                       if (FWINV(!ether_addr_equal_masked(mp, info->dmaddr,
-                                                          info->dmmsk),
-                                 EBT_ARP_DST_MAC))
+                       if (NF_INVF(info, EBT_ARP_DST_MAC,
+                                   !ether_addr_equal_masked(mp, info->dmaddr,
+                                                            info->dmmsk)))
                                return false;
                }
        }