projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[cascardo/linux.git]
/
include
/
net
/
sock.h
diff --git
a/include/net/sock.h
b/include/net/sock.h
index
8741988
..
ebf75db
100644
(file)
--- a/
include/net/sock.h
+++ b/
include/net/sock.h
@@
-1020,7
+1020,6
@@
struct proto {
void (*unhash)(struct sock *sk);
void (*rehash)(struct sock *sk);
int (*get_port)(struct sock *sk, unsigned short snum);
void (*unhash)(struct sock *sk);
void (*rehash)(struct sock *sk);
int (*get_port)(struct sock *sk, unsigned short snum);
- void (*clear_sk)(struct sock *sk, int size);
/* Keeping track of sockets in use */
#ifdef CONFIG_PROC_FS
/* Keeping track of sockets in use */
#ifdef CONFIG_PROC_FS
@@
-1114,6
+1113,16
@@
static inline bool sk_stream_is_writeable(const struct sock *sk)
sk_stream_memory_free(sk);
}
sk_stream_memory_free(sk);
}
+static inline int sk_under_cgroup_hierarchy(struct sock *sk,
+ struct cgroup *ancestor)
+{
+#ifdef CONFIG_SOCK_CGROUP_DATA
+ return cgroup_is_descendant(sock_cgroup_ptr(&sk->sk_cgrp_data),
+ ancestor);
+#else
+ return -ENOTSUPP;
+#endif
+}
static inline bool sk_has_memory_pressure(const struct sock *sk)
{
static inline bool sk_has_memory_pressure(const struct sock *sk)
{
@@
-1232,8
+1241,6
@@
static inline int __sk_prot_rehash(struct sock *sk)
return sk->sk_prot->hash(sk);
}
return sk->sk_prot->hash(sk);
}
-void sk_prot_clear_portaddr_nulls(struct sock *sk, int size);
-
/* About 10 seconds */
#define SOCK_DESTROY_TIME (10*HZ)
/* About 10 seconds */
#define SOCK_DESTROY_TIME (10*HZ)