summaryrefslogtreecommitdiffstats
path: root/include/net/ip_vs.h
diff options
context:
space:
mode:
authorEric W. Biederman2015-09-21 20:02:43 +0200
committerSimon Horman2015-09-24 02:34:41 +0200
commitd8f44c335a1111d647f41e9fa6ae65b18db112e4 (patch)
tree1232299b3ae3575e26c490c94b123370ed074a04 /include/net/ip_vs.h
parentipvs: Pass ipvs not net into ip_vs_conn_net_init and ip_vs_conn_net_cleanup (diff)
downloadkernel-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 'include/net/ip_vs.h')
-rw-r--r--include/net/ip_vs.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 5ad04be64895..c68c2c8ae48a 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -487,7 +487,8 @@ struct ip_vs_protocol {
void (*exit_netns)(struct netns_ipvs *ipvs, struct ip_vs_proto_data *pd);
- int (*conn_schedule)(int af, struct sk_buff *skb,
+ int (*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);