diff options
author | Eric W. Biederman | 2015-09-21 20:02:43 +0200 |
---|---|---|
committer | Simon Horman | 2015-09-24 02:34:41 +0200 |
commit | d8f44c335a1111d647f41e9fa6ae65b18db112e4 (patch) | |
tree | 1232299b3ae3575e26c490c94b123370ed074a04 /net/netfilter/ipvs/ip_vs_proto_ah_esp.c | |
parent | ipvs: Pass ipvs not net into ip_vs_conn_net_init and ip_vs_conn_net_cleanup (diff) | |
download | kernel-qcow2-linux-d8f44c335a1111d647f41e9fa6ae65b18db112e4.tar.gz kernel-qcow2-linux-d8f44c335a1111d647f41e9fa6ae65b18db112e4.tar.xz kernel-qcow2-linux-d8f44c335a1111d647f41e9fa6ae65b18db112e4.zip |
ipvs: Pass ipvs into .conn_schedule and ip_vs_try_to_schedule
This moves the hack "net_ipvs(skb_net(skb))" up one level where it
will be easier to remove.
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, 2 insertions, 1 deletions
diff --git a/net/netfilter/ipvs/ip_vs_proto_ah_esp.c b/net/netfilter/ipvs/ip_vs_proto_ah_esp.c index e924455de5c0..5320d39976e1 100644 --- a/net/netfilter/ipvs/ip_vs_proto_ah_esp.c +++ b/net/netfilter/ipvs/ip_vs_proto_ah_esp.c @@ -104,7 +104,8 @@ ah_esp_conn_out_get(struct netns_ipvs *ipvs, int af, const struct sk_buff *skb, static int -ah_esp_conn_schedule(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd, +ah_esp_conn_schedule(struct netns_ipvs *ipvs, int af, struct sk_buff *skb, + struct ip_vs_proto_data *pd, int *verdict, struct ip_vs_conn **cpp, struct ip_vs_iphdr *iph) { |