diff options
| author | Eric W. Biederman | 2015-09-21 20:02:39 +0200 |
|---|---|---|
| committer | Simon Horman | 2015-09-24 02:34:41 +0200 |
| commit | 0cf705c8c2e8333aff5b472cfff13f9542620500 (patch) | |
| tree | dfb8a069e3889b8036840b72adba156324d23448 /net/netfilter/ipvs/ip_vs_proto_ah_esp.c | |
| parent | ipvs: Pass ipvs into .conn_in_get and ip_vs_conn_in_get_proto (diff) | |
| download | kernel-qcow2-linux-0cf705c8c2e8333aff5b472cfff13f9542620500.tar.gz kernel-qcow2-linux-0cf705c8c2e8333aff5b472cfff13f9542620500.tar.xz kernel-qcow2-linux-0cf705c8c2e8333aff5b472cfff13f9542620500.zip | |
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_proto_ah_esp.c')
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_proto_ah_esp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/netfilter/ipvs/ip_vs_proto_ah_esp.c b/net/netfilter/ipvs/ip_vs_proto_ah_esp.c index a96d93d11807..e924455de5c0 100644 --- a/net/netfilter/ipvs/ip_vs_proto_ah_esp.c +++ b/net/netfilter/ipvs/ip_vs_proto_ah_esp.c @@ -82,12 +82,11 @@ ah_esp_conn_in_get(struct netns_ipvs *ipvs, int af, const struct sk_buff *skb, static struct ip_vs_conn * -ah_esp_conn_out_get(int af, const struct sk_buff *skb, +ah_esp_conn_out_get(struct netns_ipvs *ipvs, int af, const struct sk_buff *skb, const struct ip_vs_iphdr *iph) { struct ip_vs_conn *cp; struct ip_vs_conn_param p; - struct netns_ipvs *ipvs = net_ipvs(skb_net(skb)); ah_esp_conn_fill_param_proto(ipvs, af, iph, &p); cp = ip_vs_conn_out_get(&p); |