ipvs: change some __constant_htons() to htons()

Change __contant_htons() to htons() in the IPVS code when not in an
initializer.

-Brian

Signed-off-by: Brian Haley <brian.haley@hp.com>
Acked-by: Julius Volz <juliusv@google.com>
Signed-off-by: Simon Horman <horms@verge.net.au>

diff --git a/net/ipv4/ipvs/ip_vs_proto.c b/net/ipv4/ipvs/ip_vs_proto.c
index b06da1c3445a8d81e87c7ef995ec4ffd9e9824e7..0791f9e08feb7f04d8e2ea56aa08f1064fe6232f 100644 (file)
--- a/net/ipv4/ipvs/ip_vs_proto.c
+++ b/net/ipv4/ipvs/ip_vs_proto.c
@@ -237,7 +237,7 @@ ip_vs_tcpudp_debug_packet(struct ip_vs_protocol *pp,
                          const char *msg)
 {
 #ifdef CONFIG_IP_VS_IPV6
-       if (skb->protocol == __constant_htons(ETH_P_IPV6))
+       if (skb->protocol == htons(ETH_P_IPV6))
                ip_vs_tcpudp_debug_packet_v6(pp, skb, offset, msg);
        else
 #endif

diff --git a/net/ipv4/ipvs/ip_vs_proto_ah_esp.c b/net/ipv4/ipvs/ip_vs_proto_ah_esp.c
index 2b18a78d03993bc25173153a8a0f860f2e68a513..80ab0c8e5b4af113e7a67fa0f4032a808d248119 100644 (file)
--- a/net/ipv4/ipvs/ip_vs_proto_ah_esp.c
+++ b/net/ipv4/ipvs/ip_vs_proto_ah_esp.c
@@ -167,7 +167,7 @@ ah_esp_debug_packet(struct ip_vs_protocol *pp, const struct sk_buff *skb,
                    int offset, const char *msg)
 {
 #ifdef CONFIG_IP_VS_IPV6
-       if (skb->protocol == __constant_htons(ETH_P_IPV6))
+       if (skb->protocol == htons(ETH_P_IPV6))
                ah_esp_debug_packet_v6(pp, skb, offset, msg);
        else
 #endif