diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-03-10 10:02:32 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-03-10 10:02:32 +0800 |
| commit | c577a32260e3c74bd2ccf42273c2f5cdf981b9a0 (patch) | |
| tree | 781fff52a3bb901f96a086ea788c08596ad396ce /include/net/netns | |
| parent | e8f1cafd746408478934b9c8b9e9e0d5f450906c (diff) | |
| parent | 42f504e28a169ebfea0e3d9c6e151451800e41d5 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Most of cpu feature which hardcode in commit 3868e7f8d4799 are
included in compat_hwcap_str[]. We don't need repeat them.
Conflicts:
arch/arm64/kernel/setup.c
Diffstat (limited to 'include/net/netns')
| -rw-r--r-- | include/net/netns/ipv4.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h index 0dd6f0b3eadb..4f6c72095cf6 100644 --- a/include/net/netns/ipv4.h +++ b/include/net/netns/ipv4.h @@ -43,6 +43,7 @@ struct netns_ipv4 { struct inet_peer_base *peers; struct tcpm_hash_bucket *tcp_metrics_hash; unsigned int tcp_metrics_hash_log; + struct sock * __percpu *tcp_sk; struct netns_frags frags; #ifdef CONFIG_NETFILTER struct xt_table *iptable_filter; |