diff options
author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-22 21:50:57 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-22 21:50:57 -0400 |
commit | a5324343955997d1439f26518ddac567cd5d134b (patch) | |
tree | f43558389c41e3a0f076c4ee55d77c4aa1561779 /include/linux/net.h | |
parent | 8199d3a79c224bbe5943fa08684e1f93a17881b0 (diff) | |
parent | a4936044001694f033fe4ea94d6034d51a6b465c (diff) |
Merge /spare/repo/linux-2.6/
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; |