diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-10-30 16:16:56 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-10-30 16:16:56 -0400 |
| commit | f1e095f1d206b81b44160f41278ce5c78641e9b7 (patch) | |
| tree | bd293d46d2d3e4cdf435a22ddb2877c6ba1b8acc /include/linux/net.h | |
| parent | b0438a1b71955c425c304a2a483765ef24841766 (diff) | |
| parent | 1792f17b7210280a3d7ff29da9614ba779cfcedb (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'include/linux/net.h')
| -rw-r--r-- | include/linux/net.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/net.h b/include/linux/net.h index dee0b11a8759..16faa130088c 100644 --- a/include/linux/net.h +++ b/include/linux/net.h | |||
| @@ -229,6 +229,8 @@ enum { | |||
| 229 | extern int sock_wake_async(struct socket *sk, int how, int band); | 229 | extern int sock_wake_async(struct socket *sk, int how, int band); |
| 230 | extern int sock_register(const struct net_proto_family *fam); | 230 | extern int sock_register(const struct net_proto_family *fam); |
| 231 | extern void sock_unregister(int family); | 231 | extern void sock_unregister(int family); |
| 232 | extern int __sock_create(struct net *net, int family, int type, int proto, | ||
| 233 | struct socket **res, int kern); | ||
| 232 | extern int sock_create(int family, int type, int proto, | 234 | extern int sock_create(int family, int type, int proto, |
| 233 | struct socket **res); | 235 | struct socket **res); |
| 234 | extern int sock_create_kern(int family, int type, int proto, | 236 | extern int sock_create_kern(int family, int type, int proto, |