diff options
| author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2007-12-11 13:53:11 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 17:58:02 -0500 |
| commit | 5661df7b6cc399cabd1ed6b6a929a0445b862c10 (patch) | |
| tree | ec3b7396b815d62a90967d57287377e5ce734f36 | |
| parent | 4e39430ae33dfd9b0f47e5a89028352382c3dd34 (diff) | |
[IPVS]: Use htons() where appropriate.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv4/ipvs/ip_vs_proto.c | 2 | ||||
| -rw-r--r-- | net/ipv4/ipvs/ip_vs_proto_esp.c | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/net/ipv4/ipvs/ip_vs_proto.c b/net/ipv4/ipvs/ip_vs_proto.c index c0e11ec8f0f9..dde28a250d92 100644 --- a/net/ipv4/ipvs/ip_vs_proto.c +++ b/net/ipv4/ipvs/ip_vs_proto.c | |||
| @@ -165,7 +165,7 @@ ip_vs_tcpudp_debug_packet(struct ip_vs_protocol *pp, | |||
| 165 | ih = skb_header_pointer(skb, offset, sizeof(_iph), &_iph); | 165 | ih = skb_header_pointer(skb, offset, sizeof(_iph), &_iph); |
| 166 | if (ih == NULL) | 166 | if (ih == NULL) |
| 167 | sprintf(buf, "%s TRUNCATED", pp->name); | 167 | sprintf(buf, "%s TRUNCATED", pp->name); |
| 168 | else if (ih->frag_off & __constant_htons(IP_OFFSET)) | 168 | else if (ih->frag_off & htons(IP_OFFSET)) |
| 169 | sprintf(buf, "%s %u.%u.%u.%u->%u.%u.%u.%u frag", | 169 | sprintf(buf, "%s %u.%u.%u.%u->%u.%u.%u.%u frag", |
| 170 | pp->name, NIPQUAD(ih->saddr), | 170 | pp->name, NIPQUAD(ih->saddr), |
| 171 | NIPQUAD(ih->daddr)); | 171 | NIPQUAD(ih->daddr)); |
diff --git a/net/ipv4/ipvs/ip_vs_proto_esp.c b/net/ipv4/ipvs/ip_vs_proto_esp.c index c36ccf057a19..aef0d3ee8e44 100644 --- a/net/ipv4/ipvs/ip_vs_proto_esp.c +++ b/net/ipv4/ipvs/ip_vs_proto_esp.c | |||
| @@ -52,15 +52,15 @@ esp_conn_in_get(const struct sk_buff *skb, | |||
| 52 | if (likely(!inverse)) { | 52 | if (likely(!inverse)) { |
| 53 | cp = ip_vs_conn_in_get(IPPROTO_UDP, | 53 | cp = ip_vs_conn_in_get(IPPROTO_UDP, |
| 54 | iph->saddr, | 54 | iph->saddr, |
| 55 | __constant_htons(PORT_ISAKMP), | 55 | htons(PORT_ISAKMP), |
| 56 | iph->daddr, | 56 | iph->daddr, |
| 57 | __constant_htons(PORT_ISAKMP)); | 57 | htons(PORT_ISAKMP)); |
| 58 | } else { | 58 | } else { |
| 59 | cp = ip_vs_conn_in_get(IPPROTO_UDP, | 59 | cp = ip_vs_conn_in_get(IPPROTO_UDP, |
| 60 | iph->daddr, | 60 | iph->daddr, |
| 61 | __constant_htons(PORT_ISAKMP), | 61 | htons(PORT_ISAKMP), |
| 62 | iph->saddr, | 62 | iph->saddr, |
| 63 | __constant_htons(PORT_ISAKMP)); | 63 | htons(PORT_ISAKMP)); |
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | if (!cp) { | 66 | if (!cp) { |
| @@ -89,15 +89,15 @@ esp_conn_out_get(const struct sk_buff *skb, struct ip_vs_protocol *pp, | |||
| 89 | if (likely(!inverse)) { | 89 | if (likely(!inverse)) { |
| 90 | cp = ip_vs_conn_out_get(IPPROTO_UDP, | 90 | cp = ip_vs_conn_out_get(IPPROTO_UDP, |
| 91 | iph->saddr, | 91 | iph->saddr, |
| 92 | __constant_htons(PORT_ISAKMP), | 92 | htons(PORT_ISAKMP), |
| 93 | iph->daddr, | 93 | iph->daddr, |
| 94 | __constant_htons(PORT_ISAKMP)); | 94 | htons(PORT_ISAKMP)); |
| 95 | } else { | 95 | } else { |
| 96 | cp = ip_vs_conn_out_get(IPPROTO_UDP, | 96 | cp = ip_vs_conn_out_get(IPPROTO_UDP, |
| 97 | iph->daddr, | 97 | iph->daddr, |
| 98 | __constant_htons(PORT_ISAKMP), | 98 | htons(PORT_ISAKMP), |
| 99 | iph->saddr, | 99 | iph->saddr, |
| 100 | __constant_htons(PORT_ISAKMP)); | 100 | htons(PORT_ISAKMP)); |
| 101 | } | 101 | } |
| 102 | 102 | ||
| 103 | if (!cp) { | 103 | if (!cp) { |