diff options
Diffstat (limited to 'include/net/ip_vs.h')
-rw-r--r-- | include/net/ip_vs.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index 2bdee51ba30d..a903a828bcef 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h | |||
@@ -580,8 +580,8 @@ struct ip_vs_service_user_kern { | |||
580 | /* virtual service options */ | 580 | /* virtual service options */ |
581 | char *sched_name; | 581 | char *sched_name; |
582 | char *pe_name; | 582 | char *pe_name; |
583 | unsigned flags; /* virtual service flags */ | 583 | unsigned int flags; /* virtual service flags */ |
584 | unsigned timeout; /* persistent timeout in sec */ | 584 | unsigned int timeout; /* persistent timeout in sec */ |
585 | u32 netmask; /* persistent netmask */ | 585 | u32 netmask; /* persistent netmask */ |
586 | }; | 586 | }; |
587 | 587 | ||
@@ -592,7 +592,7 @@ struct ip_vs_dest_user_kern { | |||
592 | u16 port; | 592 | u16 port; |
593 | 593 | ||
594 | /* real server options */ | 594 | /* real server options */ |
595 | unsigned conn_flags; /* connection flags */ | 595 | unsigned int conn_flags; /* connection flags */ |
596 | int weight; /* destination weight */ | 596 | int weight; /* destination weight */ |
597 | 597 | ||
598 | /* thresholds for active connections */ | 598 | /* thresholds for active connections */ |
@@ -616,8 +616,8 @@ struct ip_vs_service { | |||
616 | union nf_inet_addr addr; /* IP address for virtual service */ | 616 | union nf_inet_addr addr; /* IP address for virtual service */ |
617 | __be16 port; /* port number for the service */ | 617 | __be16 port; /* port number for the service */ |
618 | __u32 fwmark; /* firewall mark of the service */ | 618 | __u32 fwmark; /* firewall mark of the service */ |
619 | unsigned flags; /* service status flags */ | 619 | unsigned int flags; /* service status flags */ |
620 | unsigned timeout; /* persistent timeout in ticks */ | 620 | unsigned int timeout; /* persistent timeout in ticks */ |
621 | __be32 netmask; /* grouping granularity */ | 621 | __be32 netmask; /* grouping granularity */ |
622 | struct net *net; | 622 | struct net *net; |
623 | 623 | ||
@@ -647,7 +647,7 @@ struct ip_vs_dest { | |||
647 | u16 af; /* address family */ | 647 | u16 af; /* address family */ |
648 | __be16 port; /* port number of the server */ | 648 | __be16 port; /* port number of the server */ |
649 | union nf_inet_addr addr; /* IP address of the server */ | 649 | union nf_inet_addr addr; /* IP address of the server */ |
650 | volatile unsigned flags; /* dest status flags */ | 650 | volatile unsigned int flags; /* dest status flags */ |
651 | atomic_t conn_flags; /* flags to copy to conn */ | 651 | atomic_t conn_flags; /* flags to copy to conn */ |
652 | atomic_t weight; /* server weight */ | 652 | atomic_t weight; /* server weight */ |
653 | 653 | ||
@@ -953,7 +953,7 @@ static inline int sysctl_sync_ver(struct netns_ipvs *ipvs) | |||
953 | * IPVS core functions | 953 | * IPVS core functions |
954 | * (from ip_vs_core.c) | 954 | * (from ip_vs_core.c) |
955 | */ | 955 | */ |
956 | extern const char *ip_vs_proto_name(unsigned proto); | 956 | extern const char *ip_vs_proto_name(unsigned int proto); |
957 | extern void ip_vs_init_hash_table(struct list_head *table, int rows); | 957 | extern void ip_vs_init_hash_table(struct list_head *table, int rows); |
958 | #define IP_VS_INIT_HASH_TABLE(t) ip_vs_init_hash_table((t), ARRAY_SIZE((t))) | 958 | #define IP_VS_INIT_HASH_TABLE(t) ip_vs_init_hash_table((t), ARRAY_SIZE((t))) |
959 | 959 | ||
@@ -1014,7 +1014,7 @@ extern void ip_vs_conn_fill_cport(struct ip_vs_conn *cp, __be16 cport); | |||
1014 | 1014 | ||
1015 | struct ip_vs_conn *ip_vs_conn_new(const struct ip_vs_conn_param *p, | 1015 | struct ip_vs_conn *ip_vs_conn_new(const struct ip_vs_conn_param *p, |
1016 | const union nf_inet_addr *daddr, | 1016 | const union nf_inet_addr *daddr, |
1017 | __be16 dport, unsigned flags, | 1017 | __be16 dport, unsigned int flags, |
1018 | struct ip_vs_dest *dest, __u32 fwmark); | 1018 | struct ip_vs_dest *dest, __u32 fwmark); |
1019 | extern void ip_vs_conn_expire_now(struct ip_vs_conn *cp); | 1019 | extern void ip_vs_conn_expire_now(struct ip_vs_conn *cp); |
1020 | 1020 | ||