Skip to contentSkip to conversation

ipvs: change some __constant_htons() to htons()

PATCH Applied Brian Haley 3 participants 3 messages Sep 16, 2008 – Sep 17, 2008

Subsystems (3)
Networking Network drivers IPVS
lore
Share & tools
lore

Brian Haley

author
#0 lore raw

PATCH 1/1 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 <[email protected]>

---

net/ipv4/ipvs/ip_vs_proto.c +1 -1
index b06da1c..0791f9e 100644
@@ -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
net/ipv4/ipvs/ip_vs_proto_ah_esp.c +1 -1
index 2b18a78..80ab0c8 100644
@@ -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
#1 lore raw
Quoted 6 lines · Brian Haley

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

-Brian

Signed-off-by Brian Haley <[email protected]>

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

Julius

Signature · 3 lines
Julius Volz - Corporate Operations - SysOps

Google Switzerland GmbH - Identification No.: CH-020.4.028.116-1
maintainer Applied
#2 lore raw
Quoted 4 lines · Julius Volz
Quoted 3 lines · Brian Haley

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

Quoted 8 lines
Quoted 3 lines

-Brian

Signed-off-by Brian Haley <[email protected]>

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.

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