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

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

diff --git a/net/bridge/netfilter/ebt_802_3.c b/net/bridge/netfilter/ebt_802_3.c
index 2a449b7..5fc4aff 100644 (file)
--- a/net/bridge/netfilter/ebt_802_3.c
+++ b/net/bridge/netfilter/ebt_802_3.c
@@ -20,16 +20,16 @@ ebt_802_3_mt(const struct sk_buff *skb, struct xt_action_param *par)
        __be16 type = hdr->llc.ui.ctrl & IS_UI ? hdr->llc.ui.type : hdr->llc.ni.type;
 
        if (info->bitmask & EBT_802_3_SAP) {
-               if (FWINV(info->sap != hdr->llc.ui.ssap, EBT_802_3_SAP))
+               if (NF_INVF(info, EBT_802_3_SAP, info->sap != hdr->llc.ui.ssap))
                        return false;
-               if (FWINV(info->sap != hdr->llc.ui.dsap, EBT_802_3_SAP))
+               if (NF_INVF(info, EBT_802_3_SAP, info->sap != hdr->llc.ui.dsap))
                        return false;
        }
 
        if (info->bitmask & EBT_802_3_TYPE) {
                if (!(hdr->llc.ui.dsap == CHECK_TYPE && hdr->llc.ui.ssap == CHECK_TYPE))
                        return false;
-               if (FWINV(info->type != type, EBT_802_3_TYPE))
+               if (NF_INVF(info, EBT_802_3_TYPE, info->type != type))
                        return false;
        }