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/net (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
393393
394394 void (*exit)(struct ip_vs_protocol *pp);
395395
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);
397397
398398 void (*exit_netns)(struct net *net, struct ip_vs_proto_data *pd);
399399
@@ -1203,6 +1203,8 @@ ip_vs_lookup_real_service(struct net *net, int af, __u16 protocol, · 803 unmodified lines
12031203
12041204 extern int ip_vs_use_count_inc(void);
12051205 extern void ip_vs_use_count_dec(void);
1206+extern int ip_vs_register_nl_ioctl(void);
1207+extern void ip_vs_unregister_nl_ioctl(void);
12061208 extern int ip_vs_control_init(void);
12071209 extern void ip_vs_control_cleanup(void);
12081210 extern struct ip_vs_dest *

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t