diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-09-28 17:29:52 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-28 21:03:04 -0400 |
commit | 014d730d56b559eacb11e91969a1f41c3feb36f9 (patch) | |
tree | d8c3a08108f435879b4d436c7b3c4a726d31c6af /net/ipv4/ipvs/ip_vs_ctl.c | |
parent | d4263cde88d3fee2af0aac8836bb785cdb6b06c0 (diff) |
[IPVS]: ipvs annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ipvs/ip_vs_ctl.c')
-rw-r--r-- | net/ipv4/ipvs/ip_vs_ctl.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/net/ipv4/ipvs/ip_vs_ctl.c b/net/ipv4/ipvs/ip_vs_ctl.c index 6a28fafe910c..f261616e4602 100644 --- a/net/ipv4/ipvs/ip_vs_ctl.c +++ b/net/ipv4/ipvs/ip_vs_ctl.c | |||
@@ -283,7 +283,7 @@ static atomic_t ip_vs_nullsvc_counter = ATOMIC_INIT(0); | |||
283 | * Returns hash value for virtual service | 283 | * Returns hash value for virtual service |
284 | */ | 284 | */ |
285 | static __inline__ unsigned | 285 | static __inline__ unsigned |
286 | ip_vs_svc_hashkey(unsigned proto, __u32 addr, __u16 port) | 286 | ip_vs_svc_hashkey(unsigned proto, __be32 addr, __be16 port) |
287 | { | 287 | { |
288 | register unsigned porth = ntohs(port); | 288 | register unsigned porth = ntohs(port); |
289 | 289 | ||
@@ -365,7 +365,7 @@ static int ip_vs_svc_unhash(struct ip_vs_service *svc) | |||
365 | * Get service by {proto,addr,port} in the service table. | 365 | * Get service by {proto,addr,port} in the service table. |
366 | */ | 366 | */ |
367 | static __inline__ struct ip_vs_service * | 367 | static __inline__ struct ip_vs_service * |
368 | __ip_vs_service_get(__u16 protocol, __u32 vaddr, __u16 vport) | 368 | __ip_vs_service_get(__u16 protocol, __be32 vaddr, __be16 vport) |
369 | { | 369 | { |
370 | unsigned hash; | 370 | unsigned hash; |
371 | struct ip_vs_service *svc; | 371 | struct ip_vs_service *svc; |
@@ -410,7 +410,7 @@ static __inline__ struct ip_vs_service *__ip_vs_svc_fwm_get(__u32 fwmark) | |||
410 | } | 410 | } |
411 | 411 | ||
412 | struct ip_vs_service * | 412 | struct ip_vs_service * |
413 | ip_vs_service_get(__u32 fwmark, __u16 protocol, __u32 vaddr, __u16 vport) | 413 | ip_vs_service_get(__u32 fwmark, __u16 protocol, __be32 vaddr, __be16 vport) |
414 | { | 414 | { |
415 | struct ip_vs_service *svc; | 415 | struct ip_vs_service *svc; |
416 | 416 | ||
@@ -480,7 +480,7 @@ __ip_vs_unbind_svc(struct ip_vs_dest *dest) | |||
480 | /* | 480 | /* |
481 | * Returns hash value for real service | 481 | * Returns hash value for real service |
482 | */ | 482 | */ |
483 | static __inline__ unsigned ip_vs_rs_hashkey(__u32 addr, __u16 port) | 483 | static __inline__ unsigned ip_vs_rs_hashkey(__be32 addr, __be16 port) |
484 | { | 484 | { |
485 | register unsigned porth = ntohs(port); | 485 | register unsigned porth = ntohs(port); |
486 | 486 | ||
@@ -531,7 +531,7 @@ static int ip_vs_rs_unhash(struct ip_vs_dest *dest) | |||
531 | * Lookup real service by <proto,addr,port> in the real service table. | 531 | * Lookup real service by <proto,addr,port> in the real service table. |
532 | */ | 532 | */ |
533 | struct ip_vs_dest * | 533 | struct ip_vs_dest * |
534 | ip_vs_lookup_real_service(__u16 protocol, __u32 daddr, __u16 dport) | 534 | ip_vs_lookup_real_service(__u16 protocol, __be32 daddr, __be16 dport) |
535 | { | 535 | { |
536 | unsigned hash; | 536 | unsigned hash; |
537 | struct ip_vs_dest *dest; | 537 | struct ip_vs_dest *dest; |
@@ -562,7 +562,7 @@ ip_vs_lookup_real_service(__u16 protocol, __u32 daddr, __u16 dport) | |||
562 | * Lookup destination by {addr,port} in the given service | 562 | * Lookup destination by {addr,port} in the given service |
563 | */ | 563 | */ |
564 | static struct ip_vs_dest * | 564 | static struct ip_vs_dest * |
565 | ip_vs_lookup_dest(struct ip_vs_service *svc, __u32 daddr, __u16 dport) | 565 | ip_vs_lookup_dest(struct ip_vs_service *svc, __be32 daddr, __be16 dport) |
566 | { | 566 | { |
567 | struct ip_vs_dest *dest; | 567 | struct ip_vs_dest *dest; |
568 | 568 | ||
@@ -591,7 +591,7 @@ ip_vs_lookup_dest(struct ip_vs_service *svc, __u32 daddr, __u16 dport) | |||
591 | * scheduling. | 591 | * scheduling. |
592 | */ | 592 | */ |
593 | static struct ip_vs_dest * | 593 | static struct ip_vs_dest * |
594 | ip_vs_trash_get_dest(struct ip_vs_service *svc, __u32 daddr, __u16 dport) | 594 | ip_vs_trash_get_dest(struct ip_vs_service *svc, __be32 daddr, __be16 dport) |
595 | { | 595 | { |
596 | struct ip_vs_dest *dest, *nxt; | 596 | struct ip_vs_dest *dest, *nxt; |
597 | 597 | ||
@@ -773,8 +773,8 @@ static int | |||
773 | ip_vs_add_dest(struct ip_vs_service *svc, struct ip_vs_dest_user *udest) | 773 | ip_vs_add_dest(struct ip_vs_service *svc, struct ip_vs_dest_user *udest) |
774 | { | 774 | { |
775 | struct ip_vs_dest *dest; | 775 | struct ip_vs_dest *dest; |
776 | __u32 daddr = udest->addr; | 776 | __be32 daddr = udest->addr; |
777 | __u16 dport = udest->port; | 777 | __be16 dport = udest->port; |
778 | int ret; | 778 | int ret; |
779 | 779 | ||
780 | EnterFunction(2); | 780 | EnterFunction(2); |
@@ -879,8 +879,8 @@ static int | |||
879 | ip_vs_edit_dest(struct ip_vs_service *svc, struct ip_vs_dest_user *udest) | 879 | ip_vs_edit_dest(struct ip_vs_service *svc, struct ip_vs_dest_user *udest) |
880 | { | 880 | { |
881 | struct ip_vs_dest *dest; | 881 | struct ip_vs_dest *dest; |
882 | __u32 daddr = udest->addr; | 882 | __be32 daddr = udest->addr; |
883 | __u16 dport = udest->port; | 883 | __be16 dport = udest->port; |
884 | 884 | ||
885 | EnterFunction(2); | 885 | EnterFunction(2); |
886 | 886 | ||
@@ -991,8 +991,8 @@ static int | |||
991 | ip_vs_del_dest(struct ip_vs_service *svc,struct ip_vs_dest_user *udest) | 991 | ip_vs_del_dest(struct ip_vs_service *svc,struct ip_vs_dest_user *udest) |
992 | { | 992 | { |
993 | struct ip_vs_dest *dest; | 993 | struct ip_vs_dest *dest; |
994 | __u32 daddr = udest->addr; | 994 | __be32 daddr = udest->addr; |
995 | __u16 dport = udest->port; | 995 | __be16 dport = udest->port; |
996 | 996 | ||
997 | EnterFunction(2); | 997 | EnterFunction(2); |
998 | 998 | ||