diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-05-25 04:38:26 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-05-25 04:38:26 -0400 |
| commit | c1c58ada91cfe86f19d430282132434e620a1067 (patch) | |
| tree | cd12933040a65398e9779c3596f5109e37c206c3 /include/linux/net.h | |
| parent | 67394f8f069c2fdf90f3b6d851824c07815442af (diff) | |
| parent | 2a24ab628aa7b190be32f63dfb6d96f3fb61580a (diff) | |
Merge with /usr/src/ntfs-2.6.git
Diffstat (limited to 'include/linux/net.h')
| -rw-r--r-- | include/linux/net.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/net.h b/include/linux/net.h index 6d997ff3f103..20cb226b2268 100644 --- a/include/linux/net.h +++ b/include/linux/net.h | |||
| @@ -101,7 +101,6 @@ enum sock_type { | |||
| 101 | * @sk: internal networking protocol agnostic socket representation | 101 | * @sk: internal networking protocol agnostic socket representation |
| 102 | * @wait: wait queue for several uses | 102 | * @wait: wait queue for several uses |
| 103 | * @type: socket type (%SOCK_STREAM, etc) | 103 | * @type: socket type (%SOCK_STREAM, etc) |
| 104 | * @passcred: credentials (used only in Unix Sockets (aka PF_LOCAL)) | ||
| 105 | */ | 104 | */ |
| 106 | struct socket { | 105 | struct socket { |
| 107 | socket_state state; | 106 | socket_state state; |