diff options
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/af_unix.h | 1 | ||||
-rw-r--r-- | include/net/scm.h | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/net/af_unix.h b/include/net/af_unix.h index 7dd29b7e461d..c29ff1da8a18 100644 --- a/include/net/af_unix.h +++ b/include/net/af_unix.h | |||
@@ -54,6 +54,7 @@ struct unix_sock { | |||
54 | atomic_long_t inflight; | 54 | atomic_long_t inflight; |
55 | spinlock_t lock; | 55 | spinlock_t lock; |
56 | unsigned int gc_candidate : 1; | 56 | unsigned int gc_candidate : 1; |
57 | unsigned int gc_maybe_cycle : 1; | ||
57 | wait_queue_head_t peer_wait; | 58 | wait_queue_head_t peer_wait; |
58 | }; | 59 | }; |
59 | #define unix_sk(__sk) ((struct unix_sock *)__sk) | 60 | #define unix_sk(__sk) ((struct unix_sock *)__sk) |
diff --git a/include/net/scm.h b/include/net/scm.h index f160116db54a..f45bb6eca7d4 100644 --- a/include/net/scm.h +++ b/include/net/scm.h | |||
@@ -14,8 +14,9 @@ | |||
14 | 14 | ||
15 | struct scm_fp_list | 15 | struct scm_fp_list |
16 | { | 16 | { |
17 | int count; | 17 | struct list_head list; |
18 | struct file *fp[SCM_MAX_FD]; | 18 | int count; |
19 | struct file *fp[SCM_MAX_FD]; | ||
19 | }; | 20 | }; |
20 | 21 | ||
21 | struct scm_cookie | 22 | struct scm_cookie |