From 4c4f2ad9e52258975f9b305cb7c92f5aa9e8bacb Mon Sep 17 00:00:00 2001
From: Brian Haley <brian.haley@hp.com>
Date: Tue, 16 Sep 2008 11:11:11 -0400
Subject: [PATCH] --- yaml --- r: 111671 b: refs/heads/master c:
 d286600e199aa2f1058a1f883d234e73626304d2 h: refs/heads/master i:   111669:
 6983c863072cd0dc2831b9b4252a87983ea84661   111667:
 8fd722c2a125f0615629973ec54b1dc0328b0caf   111663:
 e3e6434f9944e1ebd2f13bb794e09b2f760b0c0b v: v3

---
 [refs]                                   | 2 +-
 trunk/net/ipv4/ipvs/ip_vs_proto.c        | 2 +-
 trunk/net/ipv4/ipvs/ip_vs_proto_ah_esp.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e129bd40086d..15aba257e800 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 563e94f072714657a82a59a3bf81a719a6a25591
+refs/heads/master: d286600e199aa2f1058a1f883d234e73626304d2
diff --git a/trunk/net/ipv4/ipvs/ip_vs_proto.c b/trunk/net/ipv4/ipvs/ip_vs_proto.c
index b06da1c3445a..0791f9e08feb 100644
--- a/trunk/net/ipv4/ipvs/ip_vs_proto.c
+++ b/trunk/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/trunk/net/ipv4/ipvs/ip_vs_proto_ah_esp.c b/trunk/net/ipv4/ipvs/ip_vs_proto_ah_esp.c
index 2b18a78d0399..80ab0c8e5b4a 100644
--- a/trunk/net/ipv4/ipvs/ip_vs_proto_ah_esp.c
+++ b/trunk/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