Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d286600e authored by Brian Haley's avatar Brian Haley Committed by Simon Horman
Browse files

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: default avatarBrian Haley <brian.haley@hp.com>
Acked-by: default avatarJulius Volz <juliusv@google.com>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent 563e94f0

net/ipv4/ipvs/ip_vs_proto.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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