aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-04-30 13:23:22 -0400
committerDavid S. Miller <davem@davemloft.net>2012-04-30 13:23:22 -0400
commit5414fc12e32a0e0833ec61ba8be864c46cd19966 (patch)
treeee196c526a87c126655624218969a191b60e365f /include
parent3885ca785a3618593226687ced84f3f336dc3860 (diff)
parent6cf51852486af3d79f57bf46d00209a14244dbaa (diff)
downloadlinux-linaro-stable-5414fc12e32a0e0833ec61ba8be864c46cd19966.tar.gz
Merge branch 'master' of git://1984.lsi.us.es/net
Diffstat (limited to 'include')
-rw-r--r--include/net/ip_vs.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 2bdee51ba30d..72522f087375 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -393,7 +393,7 @@ struct ip_vs_protocol {
void (*exit)(struct ip_vs_protocol *pp);
- void (*init_netns)(struct net *net, struct ip_vs_proto_data *pd);
+ int (*init_netns)(struct net *net, struct ip_vs_proto_data *pd);
void (*exit_netns)(struct net *net, struct ip_vs_proto_data *pd);
@@ -1203,6 +1203,8 @@ ip_vs_lookup_real_service(struct net *net, int af, __u16 protocol,
extern int ip_vs_use_count_inc(void);
extern void ip_vs_use_count_dec(void);
+extern int ip_vs_register_nl_ioctl(void);
+extern void ip_vs_unregister_nl_ioctl(void);
extern int ip_vs_control_init(void);
extern void ip_vs_control_cleanup(void);
extern struct ip_vs_dest *