diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2015-09-21 13:02:43 -0500 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2015-09-24 09:34:41 +0900 |
| commit | d8f44c335a1111d647f41e9fa6ae65b18db112e4 (patch) | |
| tree | 1232299b3ae3575e26c490c94b123370ed074a04 /net/netfilter/ipvs/ip_vs_proto_ah_esp.c | |
| parent | 2f3edc6a5bb2a570f491e8e8a4a16526aff3675b (diff) | |
| download | op-kernel-dev-d8f44c335a1111d647f41e9fa6ae65b18db112e4.zip op-kernel-dev-d8f44c335a1111d647f41e9fa6ae65b18db112e4.tar.gz | |
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 e924455..5320d39 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) { |
