diff options
| author | David S. Miller <davem@davemloft.net> | 2017-10-26 12:00:30 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-26 12:00:30 +0300 |
| commit | a4484705b1b16174757f68f19d3427427f96b643 (patch) | |
| tree | a9c9688634f08f697be632ee52ea33d82a04b60c /include/linux | |
| parent | 3fc27b71b894f5e2ad611297d5817b6092c96626 (diff) | |
| parent | c5c1cc9c522fc337601213afeb39c3df2eb92d04 (diff) | |
| download | linux-a4484705b1b16174757f68f19d3427427f96b643.tar.xz | |
Merge branch 'tcp-smc-rendezvous'
Ursula Braun says:
====================
TCP experimental option for SMC rendezvous
SMC-capability is to be negotiated with a TCP experimental option.
As requested during code review of our previous approach using
netfilter hooks, here's a new version. It touches tcp-code in the
first patch and exploits the new tcp flag in the smc-code.
Changelog:
V3:
* move include for linux/unaligned/access_ok.h to tcp_input.c
V2:
* switch to current jump labels API
* remove static key checking in smc_set_capability()
(comment from Eric Dumazet)
* use inet_request_sock parameter for smc_set_option_cond()
* smc_listen_work(): replace local variable lgr_lock_taken by new labels
and separate this change into a prerequisite first
patch
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/tcp.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/linux/tcp.h b/include/linux/tcp.h index 173a7c2f9636..8c431385b272 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h @@ -98,7 +98,8 @@ struct tcp_options_received { tstamp_ok : 1, /* TIMESTAMP seen on SYN packet */ dsack : 1, /* D-SACK is scheduled */ wscale_ok : 1, /* Wscale seen on SYN packet */ - sack_ok : 4, /* SACK seen on SYN packet */ + sack_ok : 3, /* SACK seen on SYN packet */ + smc_ok : 1, /* SMC seen on SYN packet */ snd_wscale : 4, /* Window scaling received from sender */ rcv_wscale : 4; /* Window scaling to send to receiver */ u8 num_sacks; /* Number of SACK blocks */ @@ -110,6 +111,9 @@ static inline void tcp_clear_options(struct tcp_options_received *rx_opt) { rx_opt->tstamp_ok = rx_opt->sack_ok = 0; rx_opt->wscale_ok = rx_opt->snd_wscale = 0; +#if IS_ENABLED(CONFIG_SMC) + rx_opt->smc_ok = 0; +#endif } /* This is the max number of SACKS that we'll generate and process. It's safe @@ -229,7 +233,8 @@ struct tcp_sock { syn_fastopen_ch:1, /* Active TFO re-enabling probe */ syn_data_acked:1,/* data in SYN is acked by SYN-ACK */ save_syn:1, /* Save headers of SYN packet */ - is_cwnd_limited:1;/* forward progress limited by snd_cwnd? */ + is_cwnd_limited:1,/* forward progress limited by snd_cwnd? */ + syn_smc:1; /* SYN includes SMC */ u32 tlp_high_seq; /* snd_nxt at the time of TLP retransmit. */ /* RTT measurement */ |