summaryrefslogtreecommitdiffstats
path: root/include/net/inet_sock.h
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2013-10-10 00:04:37 -0700
committerDavid S. Miller <davem@davemloft.net>2013-10-10 14:37:35 -0400
commitb44084c2c822f99dd3f2334b288b7e463d222662 (patch)
tree5fbcaffd319347ee5d22800c231eef2b4c44b007 /include/net/inet_sock.h
parentba537427d77cf274592f31ce94f4b4cadfad88b4 (diff)
downloadblackbird-op-linux-b44084c2c822f99dd3f2334b288b7e463d222662.tar.gz
blackbird-op-linux-b44084c2c822f99dd3f2334b288b7e463d222662.zip
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>
Diffstat (limited to 'include/net/inet_sock.h')
-rw-r--r--include/net/inet_sock.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
index f91204442efa..06da91efbc83 100644
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
@@ -72,7 +72,7 @@ struct inet_request_sock {
struct request_sock req;
#define ir_loc_addr req.__req_common.skc_rcv_saddr
#define ir_rmt_addr req.__req_common.skc_daddr
-#define ir_loc_port req.__req_common.skc_num
+#define ir_num req.__req_common.skc_num
#define ir_rmt_port req.__req_common.skc_dport
#define ir_v6_rmt_addr req.__req_common.skc_v6_daddr
#define ir_v6_loc_addr req.__req_common.skc_v6_rcv_saddr
OpenPOWER on IntegriCloud