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

Commit 5661df7b authored by YOSHIFUJI Hideaki's avatar YOSHIFUJI Hideaki Committed by David S. Miller
Browse files

[IPVS]: Use htons() where appropriate. 



Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4e39430a

net/ipv4/ipvs/ip_vs_proto.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -165,7 +165,7 @@ ip_vs_tcpudp_debug_packet(struct ip_vs_protocol *pp, 
	ih = skb_header_pointer(skb, offset, sizeof(_iph), &_iph);

	ih = skb_header_pointer(skb, offset, sizeof(_iph), &_iph);

	if (ih == NULL)

	if (ih == NULL)

		sprintf(buf, "%s TRUNCATED", pp->name);

		sprintf(buf, "%s TRUNCATED", pp->name);

	else if (ih->frag_off & __constant_htons(IP_OFFSET))

	else if (ih->frag_off & htons(IP_OFFSET))

		sprintf(buf, "%s %u.%u.%u.%u->%u.%u.%u.%u frag",

		sprintf(buf, "%s %u.%u.%u.%u->%u.%u.%u.%u frag",

			pp->name, NIPQUAD(ih->saddr),

			pp->name, NIPQUAD(ih->saddr),

			NIPQUAD(ih->daddr));

			NIPQUAD(ih->daddr));

net/ipv4/ipvs/ip_vs_proto_esp.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -52,15 +52,15 @@ esp_conn_in_get(const struct sk_buff *skb, 
	if (likely(!inverse)) {

	if (likely(!inverse)) {

		cp = ip_vs_conn_in_get(IPPROTO_UDP,

		cp = ip_vs_conn_in_get(IPPROTO_UDP,

				       iph->saddr,

				       iph->saddr,

				       __constant_htons(PORT_ISAKMP),

				       htons(PORT_ISAKMP),

				       iph->daddr,

				       iph->daddr,

				       __constant_htons(PORT_ISAKMP));

				       htons(PORT_ISAKMP));

	} else {

	} else {

		cp = ip_vs_conn_in_get(IPPROTO_UDP,

		cp = ip_vs_conn_in_get(IPPROTO_UDP,

				       iph->daddr,

				       iph->daddr,

				       __constant_htons(PORT_ISAKMP),

				       htons(PORT_ISAKMP),

				       iph->saddr,

				       iph->saddr,

				       __constant_htons(PORT_ISAKMP));

				       htons(PORT_ISAKMP));

	}

	}





	if (!cp) {

	if (!cp) {
@@ -89,15 +89,15 @@ esp_conn_out_get(const struct sk_buff *skb, struct ip_vs_protocol *pp, 
	if (likely(!inverse)) {

	if (likely(!inverse)) {

		cp = ip_vs_conn_out_get(IPPROTO_UDP,

		cp = ip_vs_conn_out_get(IPPROTO_UDP,

					iph->saddr,

					iph->saddr,

					__constant_htons(PORT_ISAKMP),

					htons(PORT_ISAKMP),

					iph->daddr,

					iph->daddr,

					__constant_htons(PORT_ISAKMP));

					htons(PORT_ISAKMP));

	} else {

	} else {

		cp = ip_vs_conn_out_get(IPPROTO_UDP,

		cp = ip_vs_conn_out_get(IPPROTO_UDP,

					iph->daddr,

					iph->daddr,

					__constant_htons(PORT_ISAKMP),

					htons(PORT_ISAKMP),

					iph->saddr,

					iph->saddr,

					__constant_htons(PORT_ISAKMP));

					htons(PORT_ISAKMP));

	}

	}





	if (!cp) {

	if (!cp) {