diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
| commit | dba0a918722ee0f0ba3442575e4448c3ab622be4 (patch) | |
| tree | fdb466cf09e7916135098d651b18924b2fe9ba5f /include/net/scm.h | |
| parent | 0996e6382482ce9014787693d3884e9468153a5c (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'include/net/scm.h')
| -rw-r--r-- | include/net/scm.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/net/scm.h b/include/net/scm.h index 06df126103ca..33e9986beb86 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 |