History

Merge branch 'master' of git://1984.lsi.us.es/net

David S. Miller committed 14 years ago

Commit 5414fc12 parents 3885ca7 6cf518511 files · +94 −40Browse files

Showing the changes to include (1 of 11 files). Show all

Unified · Split

include/net/ip_vs.h+3−1
@@ -393,7 +393,7 @@ struct ip_vs_protocol { · 392 unmodified lines
393 393
394 void (*exit)(struct ip_vs_protocol *pp);394 void (*exit)(struct ip_vs_protocol *pp);
395 395
396 void (*init_netns)(struct net *net, struct ip_vs_proto_data *pd);396 int (*init_netns)(struct net *net, struct ip_vs_proto_data *pd);
397 397
398 void (*exit_netns)(struct net *net, struct ip_vs_proto_data *pd);398 void (*exit_netns)(struct net *net, struct ip_vs_proto_data *pd);
399 399
@@ -1203,6 +1203,8 @@ ip_vs_lookup_real_service(struct net *net, int af, __u16 protocol, · 803 unmodified lines
1203 1203
1204extern int ip_vs_use_count_inc(void);1204extern int ip_vs_use_count_inc(void);
1205extern void ip_vs_use_count_dec(void);1205extern void ip_vs_use_count_dec(void);
1206extern int ip_vs_register_nl_ioctl(void);
1207extern void ip_vs_unregister_nl_ioctl(void);
1206extern int ip_vs_control_init(void);1208extern int ip_vs_control_init(void);
1207extern void ip_vs_control_cleanup(void);1209extern void ip_vs_control_cleanup(void);
1208extern struct ip_vs_dest *1210extern struct ip_vs_dest *