netfilter: Convert uses of __constant_<foo> to <foo>

The use of __constant_<foo> has been unnecessary for quite awhile now.

Make these uses consistent with the rest of the kernel.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/net/netfilter/ipset/pfxlen.c b/net/netfilter/ipset/pfxlen.c
index 4f29fa97044b18523967cdc8b8c6ab272376a2fb..04d15fdc99eec407545c2c598c7a158de0daade9 100644 (file)
--- a/net/netfilter/ipset/pfxlen.c
+++ b/net/netfilter/ipset/pfxlen.c
@@ -7,8 +7,8 @@
 
 #define E(a, b, c, d) \
        {.ip6 = { \
-               __constant_htonl(a), __constant_htonl(b), \
-               __constant_htonl(c), __constant_htonl(d), \
+               htonl(a), htonl(b), \
+               htonl(c), htonl(d), \
        } }
 
 /*

diff --git a/net/netfilter/xt_AUDIT.c b/net/netfilter/xt_AUDIT.c
index 3228d7f24eb4107ff717af4323e834af3e680797..4973cbddc446bd50a377765bec23128716ff630e 100644 (file)
--- a/net/netfilter/xt_AUDIT.c
+++ b/net/netfilter/xt_AUDIT.c
@@ -146,11 +146,11 @@ audit_tg(struct sk_buff *skb, const struct xt_action_param *par)
 
                if (par->family == NFPROTO_BRIDGE) {
                        switch (eth_hdr(skb)->h_proto) {
-                       case __constant_htons(ETH_P_IP):
+                       case htons(ETH_P_IP):
                                audit_ip4(ab, skb);
                                break;
 
-                       case __constant_htons(ETH_P_IPV6):
+                       case htons(ETH_P_IPV6):
                                audit_ip6(ab, skb);
                                break;
                        }