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>

2 files changed, 4 insertions, 4 deletions

diff --git a/net/netfilter/ipset/pfxlen.c b/net/netfilter/ipset/pfxlen.c
index 4f29fa97044b..04d15fdc99ee 100644
--- 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 3228d7f24eb4..4973cbddc446 100644
--- 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;
                         }