diff options
author | Eric W. Biederman | 2015-09-21 20:02:38 +0200 |
---|---|---|
committer | Simon Horman | 2015-09-24 02:34:41 +0200 |
commit | ab161976421585812bcdab6592852b1b5b7dec1f (patch) | |
tree | 35b559c779c4793a47ef85d9ac53209f52acb309 /net/netfilter/ipvs/ip_vs_conn.c | |
parent | ipvs: Pass ipvs into ip_vs_conn_fill_param_proto (diff) | |
download | kernel-qcow2-linux-ab161976421585812bcdab6592852b1b5b7dec1f.tar.gz kernel-qcow2-linux-ab161976421585812bcdab6592852b1b5b7dec1f.tar.xz kernel-qcow2-linux-ab161976421585812bcdab6592852b1b5b7dec1f.zip |
ipvs: Pass ipvs into .conn_in_get and ip_vs_conn_in_get_proto
Stop relying on "net_ipvs(skb_net(skb))" to derive the ipvs as
skb_net is a hack.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'net/netfilter/ipvs/ip_vs_conn.c')
-rw-r--r-- | net/netfilter/ipvs/ip_vs_conn.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c index 6754e3595a72..439d6fb8bc29 100644 --- a/net/netfilter/ipvs/ip_vs_conn.c +++ b/net/netfilter/ipvs/ip_vs_conn.c @@ -335,10 +335,10 @@ ip_vs_conn_fill_param_proto(struct netns_ipvs *ipvs, } struct ip_vs_conn * -ip_vs_conn_in_get_proto(int af, const struct sk_buff *skb, +ip_vs_conn_in_get_proto(struct netns_ipvs *ipvs, int af, + const struct sk_buff *skb, const struct ip_vs_iphdr *iph) { - struct netns_ipvs *ipvs = net_ipvs(skb_net(skb)); struct ip_vs_conn_param p; if (ip_vs_conn_fill_param_proto(ipvs, af, skb, iph, &p)) |