Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b44084c2 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

inet: rename ir_loc_port to ir_num 



In commit 634fb979 ("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: default avatarEric Dumazet <edumazet@google.com>
Reported-by: default avatarWu Fengguang <fengguang.wu@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ba537427

include/net/inet_sock.h

+1 −1
Original line number Diff line number Diff line
@@ -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

include/net/tcp.h

+1 −1
Original line number Diff line number Diff line
@@ -1110,7 +1110,7 @@ static inline void tcp_openreq_init(struct request_sock *req, 
	ireq->acked = 0;

	ireq->ecn_ok = 0;

	ireq->ir_rmt_port = tcp_hdr(skb)->source;

	ireq->ir_loc_port = tcp_hdr(skb)->dest;

	ireq->ir_num = ntohs(tcp_hdr(skb)->dest);

}



void tcp_enter_memory_pressure(struct sock *sk);

net/dccp/ipv6.c

+2 −2
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ static int dccp_v6_send_response(struct sock *sk, struct request_sock *req) 
	fl6.flowlabel = 0;

	fl6.flowi6_oif = ireq->ir_iif;

	fl6.fl6_dport = ireq->ir_rmt_port;

	fl6.fl6_sport = ireq->ir_loc_port;

	fl6.fl6_sport = htons(ireq->ir_num);

	security_req_classify_flow(req, flowi6_to_flowi(&fl6));
@@ -509,7 +509,7 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk, 
		fl6.saddr = ireq->ir_v6_loc_addr;

		fl6.flowi6_oif = sk->sk_bound_dev_if;

		fl6.fl6_dport = ireq->ir_rmt_port;

		fl6.fl6_sport = ireq->ir_loc_port;

		fl6.fl6_sport = htons(ireq->ir_num);

		security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));



		dst = ip6_dst_lookup_flow(sk, &fl6, final_p, false);

net/dccp/minisocks.c

+4 −4
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ int dccp_reqsk_init(struct request_sock *req, 
	struct dccp_request_sock *dreq = dccp_rsk(req);



	inet_rsk(req)->ir_rmt_port = dccp_hdr(skb)->dccph_sport;

	inet_rsk(req)->ir_loc_port	  = dccp_hdr(skb)->dccph_dport;

	inet_rsk(req)->ir_num	   = ntohs(dccp_hdr(skb)->dccph_dport);

	inet_rsk(req)->acked	   = 0;

	dreq->dreq_timestamp_echo  = 0;

net/dccp/output.c

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ struct sk_buff *dccp_make_response(struct sock *sk, struct dst_entry *dst, 
	/* Build and checksum header */

	dh = dccp_zeroed_hdr(skb, dccp_header_size);



	dh->dccph_sport	= inet_rsk(req)->ir_loc_port;

	dh->dccph_sport	= htons(inet_rsk(req)->ir_num);

	dh->dccph_dport	= inet_rsk(req)->ir_rmt_port;

	dh->dccph_doff	= (dccp_header_size +

			   DCCP_SKB_CB(skb)->dccpd_opt_len) / 4;