lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[IPVS]: Annotate ..._app_hashkey().

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Al Viro
2006-11-14 21:13:28 -08:00
committed by David S. Miller
parent a64b78a077
commit 75e7ce66ef
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
net/ipv4/ipvs/ip_vs_proto_tcp.c
View File

@@ -490,16 +490,18 @@ tcp_state_transition(struct ip_vs_conn *cp, int direction,
static struct list_head tcp_apps[TCP_APP_TAB_SIZE]; static struct list_head tcp_apps[TCP_APP_TAB_SIZE];
static DEFINE_SPINLOCK(tcp_app_lock); static DEFINE_SPINLOCK(tcp_app_lock);
static inline __u16 tcp_app_hashkey(__u16 port) static inline __u16 tcp_app_hashkey(__be16 port)
{ {
return ((port >> TCP_APP_TAB_BITS) ^ port) & TCP_APP_TAB_MASK; return (((__force u16)port >> TCP_APP_TAB_BITS) ^ (__force u16)port)
& TCP_APP_TAB_MASK;
} }
static int tcp_register_app(struct ip_vs_app *inc) static int tcp_register_app(struct ip_vs_app *inc)
{ {
struct ip_vs_app *i; struct ip_vs_app *i;
__u16 hash, port = inc->port; __u16 hash;
__be16 port = inc->port;
int ret = 0; int ret = 0;
hash = tcp_app_hashkey(port); hash = tcp_app_hashkey(port);

8
net/ipv4/ipvs/ip_vs_proto_udp.c
View File

@@ -282,16 +282,18 @@ udp_csum_check(struct sk_buff *skb, struct ip_vs_protocol *pp)
static struct list_head udp_apps[UDP_APP_TAB_SIZE]; static struct list_head udp_apps[UDP_APP_TAB_SIZE];
static DEFINE_SPINLOCK(udp_app_lock); static DEFINE_SPINLOCK(udp_app_lock);
static inline __u16 udp_app_hashkey(__u16 port) static inline __u16 udp_app_hashkey(__be16 port)
{ {
return ((port >> UDP_APP_TAB_BITS) ^ port) & UDP_APP_TAB_MASK; return (((__force u16)port >> UDP_APP_TAB_BITS) ^ (__force u16)port)
& UDP_APP_TAB_MASK;
} }
static int udp_register_app(struct ip_vs_app *inc) static int udp_register_app(struct ip_vs_app *inc)
{ {
struct ip_vs_app *i; struct ip_vs_app *i;
__u16 hash, port = inc->port; __u16 hash;
__be16 port = inc->port;
int ret = 0; int ret = 0;
hash = udp_app_hashkey(port); hash = udp_app_hashkey(port);