ipvs: change some __constant_htons() to htons()
authorBrian Haley <brian.haley@hp.com>
Tue, 16 Sep 2008 15:11:11 +0000 (11:11 -0400)
committerSimon Horman <horms@verge.net.au>
Wed, 17 Sep 2008 00:13:17 +0000 (10:13 +1000)
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>
net/ipv4/ipvs/ip_vs_proto.c
net/ipv4/ipvs/ip_vs_proto_ah_esp.c

index b06da1c3445a8d81e87c7ef995ec4ffd9e9824e7..0791f9e08feb7f04d8e2ea56aa08f1064fe6232f 100644 (file)
@@ -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
index 2b18a78d03993bc25173153a8a0f860f2e68a513..80ab0c8e5b4af113e7a67fa0f4032a808d248119 100644 (file)
@@ -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