diff options
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/ip.h | 2 | ||||
-rw-r--r-- | include/net/netns/ipv4.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/net/ip.h b/include/net/ip.h index ec5cfde85e9a..bd5e444a19ce 100644 --- a/include/net/ip.h +++ b/include/net/ip.h | |||
@@ -158,7 +158,7 @@ static inline __u8 ip_reply_arg_flowi_flags(const struct ip_reply_arg *arg) | |||
158 | return (arg->flags & IP_REPLY_ARG_NOSRCCHECK) ? FLOWI_FLAG_ANYSRC : 0; | 158 | return (arg->flags & IP_REPLY_ARG_NOSRCCHECK) ? FLOWI_FLAG_ANYSRC : 0; |
159 | } | 159 | } |
160 | 160 | ||
161 | void ip_send_unicast_reply(struct sock *sk, struct sk_buff *skb, __be32 daddr, | 161 | void ip_send_unicast_reply(struct net *net, struct sk_buff *skb, __be32 daddr, |
162 | __be32 saddr, const struct ip_reply_arg *arg, | 162 | __be32 saddr, const struct ip_reply_arg *arg, |
163 | unsigned int len); | 163 | unsigned int len); |
164 | 164 | ||
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h index 2e089a99d603..d909c7fc3da1 100644 --- a/include/net/netns/ipv4.h +++ b/include/net/netns/ipv4.h | |||
@@ -38,7 +38,6 @@ struct netns_ipv4 { | |||
38 | struct sock *fibnl; | 38 | struct sock *fibnl; |
39 | 39 | ||
40 | struct sock **icmp_sk; | 40 | struct sock **icmp_sk; |
41 | struct sock *tcp_sock; | ||
42 | struct inet_peer_base *peers; | 41 | struct inet_peer_base *peers; |
43 | struct tcpm_hash_bucket *tcp_metrics_hash; | 42 | struct tcpm_hash_bucket *tcp_metrics_hash; |
44 | unsigned int tcp_metrics_hash_mask; | 43 | unsigned int tcp_metrics_hash_mask; |