diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2015-09-21 18:02:39 (GMT) |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2015-09-24 00:34:41 (GMT) |
| commit | 0cf705c8c2e8333aff5b472cfff13f9542620500 (patch) | |
| tree | dfb8a069e3889b8036840b72adba156324d23448 /net/netfilter/ipvs/ip_vs_conn.c | |
| parent | ab161976421585812bcdab6592852b1b5b7dec1f (diff) | |
| download | linux-0cf705c8c2e8333aff5b472cfff13f9542620500.tar.xz | |
ipvs: Pass ipvs into conn_out_get
Move the hack of relying on "net_ipvs(skb_net(skb))" to derive the
ipvs up a layer.
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 439d6fb..7a4d1d8 100644 --- a/net/netfilter/ipvs/ip_vs_conn.c +++ b/net/netfilter/ipvs/ip_vs_conn.c @@ -440,10 +440,10 @@ struct ip_vs_conn *ip_vs_conn_out_get(const struct ip_vs_conn_param *p) } struct ip_vs_conn * -ip_vs_conn_out_get_proto(int af, const struct sk_buff *skb, +ip_vs_conn_out_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)) |