diff options
author | Glauber Costa <glommer@parallels.com> | 2011-12-15 19:52:00 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-12-16 15:35:17 -0500 |
commit | c607b2ed84929e143d9fb5653c4b5d0109147cde (patch) | |
tree | 6bb881df1115cb7fa045b94045cde43bd0684bf1 /include/net/sock.h | |
parent | 36b77a52087a9fca4228c06e0730750f9b6468f0 (diff) |
net: fix compilation with !CONFIG_NET
Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Glauber Costa <glommer@parallels.com>
CC: Hiroyouki Kamezawa <kamezawa.hiroyu@jp.fujitsu.com>
CC: David S. Miller <davem@davemloft.net>
CC: Eric Dumazet <eric.dumazet@gmail.com>
CC: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/sock.h')
-rw-r--r-- | include/net/sock.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 6fe0dae81451..3144c7950649 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
@@ -66,8 +66,20 @@ | |||
66 | 66 | ||
67 | struct cgroup; | 67 | struct cgroup; |
68 | struct cgroup_subsys; | 68 | struct cgroup_subsys; |
69 | #ifdef CONFIG_NET | ||
69 | int mem_cgroup_sockets_init(struct cgroup *cgrp, struct cgroup_subsys *ss); | 70 | int mem_cgroup_sockets_init(struct cgroup *cgrp, struct cgroup_subsys *ss); |
70 | void mem_cgroup_sockets_destroy(struct cgroup *cgrp, struct cgroup_subsys *ss); | 71 | void mem_cgroup_sockets_destroy(struct cgroup *cgrp, struct cgroup_subsys *ss); |
72 | #else | ||
73 | static inline | ||
74 | int mem_cgroup_sockets_init(struct cgroup *cgrp, struct cgroup_subsys *ss) | ||
75 | { | ||
76 | return 0; | ||
77 | } | ||
78 | static inline | ||
79 | void mem_cgroup_sockets_destroy(struct cgroup *cgrp, struct cgroup_subsys *ss) | ||
80 | { | ||
81 | } | ||
82 | #endif | ||
71 | /* | 83 | /* |
72 | * This structure really needs to be cleaned up. | 84 | * This structure really needs to be cleaned up. |
73 | * Most of it is for TCP, and not used by any of | 85 | * Most of it is for TCP, and not used by any of |