]> Pileus Git - ~andy/linux/commit
inet: rename ir_loc_port to ir_num
authorEric Dumazet <edumazet@google.com>
Thu, 10 Oct 2013 07:04:37 +0000 (00:04 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 10 Oct 2013 18:37:35 +0000 (14:37 -0400)
commitb44084c2c822f99dd3f2334b288b7e463d222662
tree5fbcaffd319347ee5d22800c231eef2b4c44b007
parentba537427d77cf274592f31ce94f4b4cadfad88b4
inet: rename ir_loc_port to ir_num

In commit 634fb979e8f ("inet: includes a sock_common in request_sock")
I forgot that the two ports in sock_common do not have same byte order :

skc_dport is __be16 (network order), but skc_num is __u16 (host order)

So sparse complains because ir_loc_port (mapped into skc_num) is
considered as __u16 while it should be __be16

Let rename ir_loc_port to ireq->ir_num (analogy with inet->inet_num),
and perform appropriate htons/ntohs conversions.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/inet_sock.h
include/net/tcp.h
net/dccp/ipv6.c
net/dccp/minisocks.c
net/dccp/output.c
net/ipv4/inet_connection_sock.c
net/ipv4/syncookies.c
net/ipv4/tcp_output.c
net/ipv6/inet6_connection_sock.c
net/ipv6/syncookies.c
net/ipv6/tcp_ipv6.c