diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-02-06 12:03:08 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-02-06 12:03:08 +0800 |
| commit | 1e96b17b74a5690ee21d95b59722ecc124fee738 (patch) | |
| tree | fc63fd332f418eb5dac357d4cbd6ca6d776337b6 /include | |
| parent | 5bee6fb934ecb5c3eac5aa05b3c39505a4c130ad (diff) | |
| parent | d69f58e2b8396658b7577113f9887bd4d66d25f8 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'include')
| -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 */ }; |