Re: [PATCH net-next 5/6] netfilter: Convert uses of __constant_<foo> to <foo>

[Jozsef Kadlecsik]

On Wed, 12 Mar 2014, Joe Perches wrote:

> 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@xxxxxxxxxxx>

Acked-by: Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxxxxxx>

> ---
>  net/netfilter/ipset/pfxlen.c | 4 ++--
>  net/netfilter/xt_AUDIT.c     | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/net/netfilter/ipset/pfxlen.c b/net/netfilter/ipset/pfxlen.c
> index 4f29fa9..04d15fd 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 3228d7f..4973cbd 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;
>  			}
> -- 
> 1.8.1.2.459.gbcd45b4.dirty
> 

-
E-mail  : kadlec@xxxxxxxxxxxxxxxxx, kadlecsik.jozsef@xxxxxxxxxxxxx
PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences
          H-1525 Budapest 114, POB. 49, Hungary
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/