git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...
[safe/jmp/linux-2.6]
/
include
/
net
/
inet_common.h
diff --git
a/include/net/inet_common.h
b/include/net/inet_common.h
index
d6238bd
..
18c7732
100644
(file)
--- a/
include/net/inet_common.h
+++ b/
include/net/inet_common.h
@@
-39,10
+39,16
@@
extern int inet_getname(struct socket *sock,
extern int inet_ioctl(struct socket *sock,
unsigned int cmd, unsigned long arg);
extern int inet_ioctl(struct socket *sock,
unsigned int cmd, unsigned long arg);
-extern int inet_ctl_sock_create(struct sock
et **soc
k,
+extern int inet_ctl_sock_create(struct sock
**s
k,
unsigned short family,
unsigned short type,
unsigned short family,
unsigned short type,
- unsigned char protocol);
+ unsigned char protocol,
+ struct net *net);
+
+static inline void inet_ctl_sock_destroy(struct sock *sk)
+{
+ sk_release_kernel(sk);
+}
#endif
#endif