diff options
| author | Brian Haley <brian.haley@hp.com> | 2008-09-16 17:11:11 +0200 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2008-09-17 02:13:17 +0200 |
| commit | d286600e199aa2f1058a1f883d234e73626304d2 (patch) | |
| tree | a84436fb4b5d5fa62810bce573125a21db785970 /net/ipv4/ipvs | |
| parent | ipvs: add __aquire/__release annotations to ip_vs_info_seq_start/ip_vs_info_s... (diff) | |
| download | linux-d286600e199aa2f1058a1f883d234e73626304d2.tar.xz linux-d286600e199aa2f1058a1f883d234e73626304d2.zip | |
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 <brian.haley@hp.com>
Acked-by: Julius Volz <juliusv@google.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'net/ipv4/ipvs')
| -rw-r--r-- | net/ipv4/ipvs/ip_vs_proto.c | 2 | ||||
| -rw-r--r-- | net/ipv4/ipvs/ip_vs_proto_ah_esp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ipvs/ip_vs_proto.c b/net/ipv4/ipvs/ip_vs_proto.c index b06da1c3445a..0791f9e08feb 100644 --- a/net/ipv4/ipvs/ip_vs_proto.c +++ b/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/net/ipv4/ipvs/ip_vs_proto_ah_esp.c b/net/ipv4/ipvs/ip_vs_proto_ah_esp.c index 2b18a78d0399..80ab0c8e5b4a 100644 --- a/net/ipv4/ipvs/ip_vs_proto_ah_esp.c +++ b/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 |