net: ipv4: move tcp_fastopen server side code to SipHash library

[linux.git] / include / linux / tcp.h

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 711361af9ce019f08c8b6accc33220b673b34d56..9ea0e71f5c6a5a35807fee025fe843465e1e23ae 100644 (file)
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -58,12 +58,7 @@ static inline unsigned int tcp_optlen(const struct sk_buff *skb)
 
 /* TCP Fast Open Cookie as stored in memory */
 struct tcp_fastopen_cookie {
-       union {
-               u8      val[TCP_FASTOPEN_COOKIE_MAX];
-#if IS_ENABLED(CONFIG_IPV6)
-               struct in6_addr addr;
-#endif
-       };
+       u64     val[TCP_FASTOPEN_COOKIE_MAX / sizeof(u64)];
        s8      len;
        bool    exp;    /* In RFC6994 experimental option format */
 };
@@ -245,6 +240,7 @@ struct tcp_sock {
                syn_smc:1;      /* SYN includes SMC */
        u32     tlp_high_seq;   /* snd_nxt at the time of TLP retransmit. */
 
+       u32     tcp_tx_delay;   /* delay (in usec) added to TX packets */
        u64     tcp_wstamp_ns;  /* departure time for next sent data packet */
        u64     tcp_clock_cache; /* cache last tcp_clock_ns() (see tcp_mstamp_refresh()) */
 
@@ -436,6 +432,7 @@ struct tcp_timewait_sock {
        u32                       tw_last_oow_ack_time;
 
        int                       tw_ts_recent_stamp;
+       u32                       tw_tx_delay;
 #ifdef CONFIG_TCP_MD5SIG
        struct tcp_md5sig_key     *tw_md5_key;
 #endif