Skip to content

Commit

Permalink
netfilter: Convert uses of __constant_<foo> to <foo>
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Joe Perches authored and Pablo Neira Ayuso committed Mar 13, 2014
1 parent 14e1a97 commit b80edf0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions net/netfilter/ipset/pfxlen.c
Original file line number Diff line number Diff line change
Expand Up @@ -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), \
} }

/*
Expand Down
4 changes: 2 additions & 2 deletions net/netfilter/xt_AUDIT.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit b80edf0

Please sign in to comment.