]> xenbits.xensource.com Git - people/liuw/freebsd.git/commitdiff
pf: Fix compliation warning with gcc
authorkp <kp@FreeBSD.org>
Sun, 25 Oct 2015 18:09:03 +0000 (18:09 +0000)
committerkp <kp@FreeBSD.org>
Sun, 25 Oct 2015 18:09:03 +0000 (18:09 +0000)
While fixing the PF_ANEQ() macro I messed up the parentheses, leading to
compliation warnings with gcc.

Spotted by:     ian
Pointy Hat:     kp

sys/net/pfvar.h

index 62d85897d14a6737ce972e426becc5f9a7c04c92..2a7182e78b9f0c92ed0149d495725fe22187b914 100644 (file)
@@ -199,10 +199,10 @@ extern struct rwlock pf_rules_lock;
 
 #define PF_ANEQ(a, b, c) \
        ((c == AF_INET && (a)->addr32[0] != (b)->addr32[0]) || \
-       (c == AF_INET6 && (a)->addr32[3] != (b)->addr32[3] && \
+       (c == AF_INET6 && ((a)->addr32[0] != (b)->addr32[0] || \
        (a)->addr32[1] != (b)->addr32[1] || \
        (a)->addr32[2] != (b)->addr32[2] || \
-       (a)->addr32[3] != (b)->addr32[3])) \
+       (a)->addr32[3] != (b)->addr32[3]))) \
 
 #define PF_AZERO(a, c) \
        ((c == AF_INET && !(a)->addr32[0]) || \