Merge branch 'kmap_atomic' of git://github.com/congwang/linux

[karo-tx-linux.git] / include / net / netns / ipv4.h

diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
index 2e089a99d6038454b5aeb02e3fafdfda98119d7c..0ffb8e31f3cd3c2785371c636260dd51f91a89d2 100644 (file)
--- a/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
@@ -38,10 +38,9 @@ struct netns_ipv4 {
        struct sock             *fibnl;
 
        struct sock             **icmp_sk;
-       struct sock             *tcp_sock;
        struct inet_peer_base   *peers;
        struct tcpm_hash_bucket *tcp_metrics_hash;
-       unsigned int            tcp_metrics_hash_mask;
+       unsigned int            tcp_metrics_hash_log;
        struct netns_frags      frags;
 #ifdef CONFIG_NETFILTER
        struct xt_table         *iptable_filter;