Skip to content

Commit 735d383

Browse files
Florian Westphaldavem330
Florian Westphal
authored and
davem330
committed
tcp: change TCP_ECN prefixes to lower case
Suggested by Stephen. Also drop inline keyword and let compiler decide. gcc 4.7.3 decides to no longer inline tcp_ecn_check_ce, so split it up. The actual evaluation is not inlined anymore while the ECN_OK test is. Suggested-by: Stephen Hemminger <[email protected]> Signed-off-by: Daniel Borkmann <[email protected]> Signed-off-by: Florian Westphal <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent d82bd12 commit 735d383

File tree

3 files changed

+34
-31
lines changed

3 files changed

+34
-31
lines changed

‎net/ipv4/tcp_input.c

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -201,28 +201,25 @@ static inline bool tcp_in_quickack_mode(const struct sock *sk)
201201
return icsk->icsk_ack.quick && !icsk->icsk_ack.pingpong;
202202
}
203203

204-
static inline void TCP_ECN_queue_cwr(struct tcp_sock *tp)
204+
static void tcp_ecn_queue_cwr(struct tcp_sock *tp)
205205
{
206206
if (tp->ecn_flags & TCP_ECN_OK)
207207
tp->ecn_flags |= TCP_ECN_QUEUE_CWR;
208208
}
209209

210-
static inline void TCP_ECN_accept_cwr(struct tcp_sock *tp, const struct sk_buff *skb)
210+
static void tcp_ecn_accept_cwr(struct tcp_sock *tp, const struct sk_buff *skb)
211211
{
212212
if (tcp_hdr(skb)->cwr)
213213
tp->ecn_flags &= ~TCP_ECN_DEMAND_CWR;
214214
}
215215

216-
static inline void TCP_ECN_withdraw_cwr(struct tcp_sock *tp)
216+
static void tcp_ecn_withdraw_cwr(struct tcp_sock *tp)
217217
{
218218
tp->ecn_flags &= ~TCP_ECN_DEMAND_CWR;
219219
}
220220

221-
static inline void TCP_ECN_check_ce(struct tcp_sock *tp, const struct sk_buff *skb)
221+
static void __tcp_ecn_check_ce(struct tcp_sock *tp, const struct sk_buff *skb)
222222
{
223-
if (!(tp->ecn_flags & TCP_ECN_OK))
224-
return;
225-
226223
switch (TCP_SKB_CB(skb)->ip_dsfield & INET_ECN_MASK) {
227224
case INET_ECN_NOT_ECT:
228225
/* Funny extension: if ECT is not set on a segment,
@@ -251,19 +248,25 @@ static inline void TCP_ECN_check_ce(struct tcp_sock *tp, const struct sk_buff *s
251248
}
252249
}
253250

254-
static inline void TCP_ECN_rcv_synack(struct tcp_sock *tp, const struct tcphdr *th)
251+
static void tcp_ecn_check_ce(struct tcp_sock *tp, const struct sk_buff *skb)
252+
{
253+
if (tp->ecn_flags & TCP_ECN_OK)
254+
__tcp_ecn_check_ce(tp, skb);
255+
}
256+
257+
static void tcp_ecn_rcv_synack(struct tcp_sock *tp, const struct tcphdr *th)
255258
{
256259
if ((tp->ecn_flags & TCP_ECN_OK) && (!th->ece || th->cwr))
257260
tp->ecn_flags &= ~TCP_ECN_OK;
258261
}
259262

260-
static inline void TCP_ECN_rcv_syn(struct tcp_sock *tp, const struct tcphdr *th)
263+
static void tcp_ecn_rcv_syn(struct tcp_sock *tp, const struct tcphdr *th)
261264
{
262265
if ((tp->ecn_flags & TCP_ECN_OK) && (!th->ece || !th->cwr))
263266
tp->ecn_flags &= ~TCP_ECN_OK;
264267
}
265268

266-
static bool TCP_ECN_rcv_ecn_echo(const struct tcp_sock *tp, const struct tcphdr *th)
269+
static bool tcp_ecn_rcv_ecn_echo(const struct tcp_sock *tp, const struct tcphdr *th)
267270
{
268271
if (th->ece && !th->syn && (tp->ecn_flags & TCP_ECN_OK))
269272
return true;
@@ -660,7 +663,7 @@ static void tcp_event_data_recv(struct sock *sk, struct sk_buff *skb)
660663
}
661664
icsk->icsk_ack.lrcvtime = now;
662665

663-
TCP_ECN_check_ce(tp, skb);
666+
tcp_ecn_check_ce(tp, skb);
664667

665668
if (skb->len >= 128)
666669
tcp_grow_window(sk, skb);
@@ -1976,7 +1979,7 @@ void tcp_enter_loss(struct sock *sk)
19761979
sysctl_tcp_reordering);
19771980
tcp_set_ca_state(sk, TCP_CA_Loss);
19781981
tp->high_seq = tp->snd_nxt;
1979-
TCP_ECN_queue_cwr(tp);
1982+
tcp_ecn_queue_cwr(tp);
19801983

19811984
/* F-RTO RFC5682 sec 3.1 step 1: retransmit SND.UNA if no previous
19821985
* loss recovery is underway except recurring timeout(s) on
@@ -2368,7 +2371,7 @@ static void tcp_undo_cwnd_reduction(struct sock *sk, bool unmark_loss)
23682371

23692372
if (tp->prior_ssthresh > tp->snd_ssthresh) {
23702373
tp->snd_ssthresh = tp->prior_ssthresh;
2371-
TCP_ECN_withdraw_cwr(tp);
2374+
tcp_ecn_withdraw_cwr(tp);
23722375
}
23732376
} else {
23742377
tp->snd_cwnd = max(tp->snd_cwnd, tp->snd_ssthresh);
@@ -2498,7 +2501,7 @@ static void tcp_init_cwnd_reduction(struct sock *sk)
24982501
tp->prr_delivered = 0;
24992502
tp->prr_out = 0;
25002503
tp->snd_ssthresh = inet_csk(sk)->icsk_ca_ops->ssthresh(sk);
2501-
TCP_ECN_queue_cwr(tp);
2504+
tcp_ecn_queue_cwr(tp);
25022505
}
25032506

25042507
static void tcp_cwnd_reduction(struct sock *sk, const int prior_unsacked,
@@ -3453,7 +3456,7 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)
34533456
flag |= tcp_sacktag_write_queue(sk, skb, prior_snd_una,
34543457
&sack_rtt_us);
34553458

3456-
if (TCP_ECN_rcv_ecn_echo(tp, tcp_hdr(skb))) {
3459+
if (tcp_ecn_rcv_ecn_echo(tp, tcp_hdr(skb))) {
34573460
flag |= FLAG_ECE;
34583461
ack_ev_flags |= CA_ACK_ECE;
34593462
}
@@ -4193,7 +4196,7 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb)
41934196
struct sk_buff *skb1;
41944197
u32 seq, end_seq;
41954198

4196-
TCP_ECN_check_ce(tp, skb);
4199+
tcp_ecn_check_ce(tp, skb);
41974200

41984201
if (unlikely(tcp_try_rmem_schedule(sk, skb, skb->truesize))) {
41994202
NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPOFODROP);
@@ -4376,7 +4379,7 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb)
43764379
skb_dst_drop(skb);
43774380
__skb_pull(skb, tcp_hdr(skb)->doff * 4);
43784381

4379-
TCP_ECN_accept_cwr(tp, skb);
4382+
tcp_ecn_accept_cwr(tp, skb);
43804383

43814384
tp->rx_opt.dsack = 0;
43824385

@@ -5457,7 +5460,7 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb,
54575460
* state to ESTABLISHED..."
54585461
*/
54595462

5460-
TCP_ECN_rcv_synack(tp, th);
5463+
tcp_ecn_rcv_synack(tp, th);
54615464

54625465
tcp_init_wl(tp, TCP_SKB_CB(skb)->seq);
54635466
tcp_ack(sk, skb, FLAG_SLOWPATH);
@@ -5576,7 +5579,7 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb,
55765579
tp->snd_wl1 = TCP_SKB_CB(skb)->seq;
55775580
tp->max_window = tp->snd_wnd;
55785581

5579-
TCP_ECN_rcv_syn(tp, th);
5582+
tcp_ecn_rcv_syn(tp, th);
55805583

55815584
tcp_mtup_init(sk);
55825585
tcp_sync_mss(sk, icsk->icsk_pmtu_cookie);

‎net/ipv4/tcp_minisocks.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -393,8 +393,8 @@ void tcp_openreq_init_rwin(struct request_sock *req,
393393
}
394394
EXPORT_SYMBOL(tcp_openreq_init_rwin);
395395

396-
static inline void TCP_ECN_openreq_child(struct tcp_sock *tp,
397-
struct request_sock *req)
396+
static void tcp_ecn_openreq_child(struct tcp_sock *tp,
397+
const struct request_sock *req)
398398
{
399399
tp->ecn_flags = inet_rsk(req)->ecn_ok ? TCP_ECN_OK : 0;
400400
}
@@ -507,7 +507,7 @@ struct sock *tcp_create_openreq_child(struct sock *sk, struct request_sock *req,
507507
if (skb->len >= TCP_MSS_DEFAULT + newtp->tcp_header_len)
508508
newicsk->icsk_ack.last_seg_size = skb->len - newtp->tcp_header_len;
509509
newtp->rx_opt.mss_clamp = req->mss;
510-
TCP_ECN_openreq_child(newtp, req);
510+
tcp_ecn_openreq_child(newtp, req);
511511
newtp->fastopen_rsk = NULL;
512512
newtp->syn_data_acked = 0;
513513

‎net/ipv4/tcp_output.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ static u16 tcp_select_window(struct sock *sk)
318318
}
319319

320320
/* Packet ECN state for a SYN-ACK */
321-
static inline void TCP_ECN_send_synack(struct sock *sk, struct sk_buff *skb)
321+
static void tcp_ecn_send_synack(struct sock *sk, struct sk_buff *skb)
322322
{
323323
const struct tcp_sock *tp = tcp_sk(sk);
324324

@@ -330,7 +330,7 @@ static inline void TCP_ECN_send_synack(struct sock *sk, struct sk_buff *skb)
330330
}
331331

332332
/* Packet ECN state for a SYN. */
333-
static inline void TCP_ECN_send_syn(struct sock *sk, struct sk_buff *skb)
333+
static void tcp_ecn_send_syn(struct sock *sk, struct sk_buff *skb)
334334
{
335335
struct tcp_sock *tp = tcp_sk(sk);
336336

@@ -344,8 +344,8 @@ static inline void TCP_ECN_send_syn(struct sock *sk, struct sk_buff *skb)
344344
}
345345
}
346346

347-
static __inline__ void
348-
TCP_ECN_make_synack(const struct request_sock *req, struct tcphdr *th,
347+
static void
348+
tcp_ecn_make_synack(const struct request_sock *req, struct tcphdr *th,
349349
struct sock *sk)
350350
{
351351
if (inet_rsk(req)->ecn_ok) {
@@ -358,7 +358,7 @@ TCP_ECN_make_synack(const struct request_sock *req, struct tcphdr *th,
358358
/* Set up ECN state for a packet on a ESTABLISHED socket that is about to
359359
* be sent.
360360
*/
361-
static inline void TCP_ECN_send(struct sock *sk, struct sk_buff *skb,
361+
static void tcp_ecn_send(struct sock *sk, struct sk_buff *skb,
362362
int tcp_header_len)
363363
{
364364
struct tcp_sock *tp = tcp_sk(sk);
@@ -960,7 +960,7 @@ static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it,
960960

961961
tcp_options_write((__be32 *)(th + 1), tp, &opts);
962962
if (likely((tcb->tcp_flags & TCPHDR_SYN) == 0))
963-
TCP_ECN_send(sk, skb, tcp_header_size);
963+
tcp_ecn_send(sk, skb, tcp_header_size);
964964

965965
#ifdef CONFIG_TCP_MD5SIG
966966
/* Calculate the MD5 hash, as we have all we need now */
@@ -2800,7 +2800,7 @@ int tcp_send_synack(struct sock *sk)
28002800
}
28012801

28022802
TCP_SKB_CB(skb)->tcp_flags |= TCPHDR_ACK;
2803-
TCP_ECN_send_synack(sk, skb);
2803+
tcp_ecn_send_synack(sk, skb);
28042804
}
28052805
return tcp_transmit_skb(sk, skb, 1, GFP_ATOMIC);
28062806
}
@@ -2859,7 +2859,7 @@ struct sk_buff *tcp_make_synack(struct sock *sk, struct dst_entry *dst,
28592859
memset(th, 0, sizeof(struct tcphdr));
28602860
th->syn = 1;
28612861
th->ack = 1;
2862-
TCP_ECN_make_synack(req, th, sk);
2862+
tcp_ecn_make_synack(req, th, sk);
28632863
th->source = htons(ireq->ir_num);
28642864
th->dest = ireq->ir_rmt_port;
28652865
/* Setting of flags are superfluous here for callers (and ECE is
@@ -3098,7 +3098,7 @@ int tcp_connect(struct sock *sk)
30983098
tcp_init_nondata_skb(buff, tp->write_seq++, TCPHDR_SYN);
30993099
tp->retrans_stamp = tcp_time_stamp;
31003100
tcp_connect_queue_skb(sk, buff);
3101-
TCP_ECN_send_syn(sk, buff);
3101+
tcp_ecn_send_syn(sk, buff);
31023102

31033103
/* Send off SYN; include data in Fast Open. */
31043104
err = tp->fastopen_req ? tcp_send_syn_data(sk, buff) :

0 commit comments

Comments
 (0)