diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-02-06 12:03:07 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-02-06 12:03:07 +0800 |
| commit | d69f58e2b8396658b7577113f9887bd4d66d25f8 (patch) | |
| tree | 217a2a766669c825645f5ff5b64ff6fcc875efc5 /include/linux | |
| parent | efa59a01f75e4b1e1b870cbdbb4ffd5a0ab27caf (diff) | |
| parent | 4686ea264f1dfec6bc5db9ef4bb9ed5babbb78cd (diff) | |
Merge tag 'v4.4.47' into linux-linaro-lsk-v4.4
This is the 4.4.47 stable release
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/tcp.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/tcp.h b/include/linux/tcp.h index b386361ba3e8..318c24612458 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h @@ -56,8 +56,13 @@ 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 + }; s8 len; - u8 val[TCP_FASTOPEN_COOKIE_MAX]; bool exp; /* In RFC6994 experimental option format */ }; |