Merge tag 'v3.10.70' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / include / net / netns / ipv4.h

diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
index 0dd6f0b3eadb96119658697e949e50334dcd9434..4f6c72095cf6c125fddcdd41e868f1e3ef1f5a64 100644 (file)
--- 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;