[PATCH] ipvs: change some __constant_htons() to htons()

[PATCH] ipvs: change some __constant_htons() to htons()

[Brian Haley]

[-- Attachment #1: Type: text/plain, Size: 143 bytes --]

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

-Brian

Signed-off-by: Brian Haley <brian.haley@hp.com>
---

[-- Attachment #2: ipvs.htons.patch --]
[-- Type: text/x-patch, Size: 974 bytes --]

diff --git a/net/ipv4/ipvs/ip_vs_proto.c b/net/ipv4/ipvs/ip_vs_proto.c
index b06da1c..0791f9e 100644
--- 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 2b18a78..80ab0c8 100644
--- 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

Re: [PATCH] ipvs: change some __constant_htons() to htons()

[Julius Volz]

On Tue, Sep 16, 2008 at 5:11 PM, Brian Haley <brian.haley@hp.com> wrote:
> Change __contant_htons() to htons() in the IPVS code when not in an
> initializer.
>
> -Brian
>
> Signed-off-by: Brian Haley <brian.haley@hp.com>

Thanks. I somehow missed that in the patch series that got in,
although you mentioned it before, sorry!

Julius

-- 
Julius Volz - Corporate Operations - SysOps

Google Switzerland GmbH - Identification No.: CH-020.4.028.116-1

Re: [PATCH] ipvs: change some __constant_htons() to htons()

[Simon Horman]

On Tue, Sep 16, 2008 at 05:31:39PM +0200, Julius Volz wrote:
> On Tue, Sep 16, 2008 at 5:11 PM, Brian Haley <brian.haley@hp.com> wrote:
> > Change __contant_htons() to htons() in the IPVS code when not in an
> > initializer.
> >
> > -Brian
> >
> > Signed-off-by: Brian Haley <brian.haley@hp.com>
> 
> Thanks. I somehow missed that in the patch series that got in,
> although you mentioned it before, sorry!
> 
> Julius

Thanks, applied to the lvs-next-2.6 branch of lvs-2.6.

-- 
Simon Horman
  VA Linux Systems Japan K.K., Sydney, Australia Satellite Office
  H: www.vergenet.net/~horms/             W: www.valinux.co.jp/en