Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

[karo-tx-linux.git] / net / netfilter / xt_tcpudp.c

diff --git a/net/netfilter/xt_tcpudp.c b/net/netfilter/xt_tcpudp.c
index c14d4645daa3525d3ce45548344e4973763cd599..ade024c90f4f129a7c384e9e1cbfdb8ffe73065f 100644 (file)
--- a/net/netfilter/xt_tcpudp.c
+++ b/net/netfilter/xt_tcpudp.c
@@ -83,8 +83,6 @@ static bool tcp_mt(const struct sk_buff *skb, struct xt_action_param *par)
                return false;
        }
 
-#define FWINVTCP(bool, invflg) ((bool) ^ !!(tcpinfo->invflags & (invflg)))
-
        th = skb_header_pointer(skb, par->thoff, sizeof(_tcph), &_tcph);
        if (th == NULL) {
                /* We've been asked to examine this packet, and we
@@ -102,9 +100,8 @@ static bool tcp_mt(const struct sk_buff *skb, struct xt_action_param *par)
                        ntohs(th->dest),
                        !!(tcpinfo->invflags & XT_TCP_INV_DSTPT)))
                return false;
-       if (!FWINVTCP((((unsigned char *)th)[13] & tcpinfo->flg_mask)
-                     == tcpinfo->flg_cmp,
-                     XT_TCP_INV_FLAGS))
+       if (!NF_INVF(tcpinfo, XT_TCP_INV_FLAGS,
+                    (((unsigned char *)th)[13] & tcpinfo->flg_mask) == tcpinfo->flg_cmp))
                return false;
        if (tcpinfo->option) {
                if (th->doff * 4 < sizeof(_tcph)) {