diff options
| author | Jiri Kosina | 2010-08-04 15:14:38 +0200 |
|---|---|---|
| committer | Jiri Kosina | 2010-08-04 15:14:38 +0200 |
| commit | d790d4d583aeaed9fc6f8a9f4d9f8ce6b1c15c7f (patch) | |
| tree | 854ab394486288d40fa8179cbfaf66e8bdc44b0f /include/linux/net.h | |
| parent | fix comment typo "choosed" -> "chosen" (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw (diff) | |
| download | kernel-qcow2-linux-d790d4d583aeaed9fc6f8a9f4d9f8ce6b1c15c7f.tar.gz kernel-qcow2-linux-d790d4d583aeaed9fc6f8a9f4d9f8ce6b1c15c7f.tar.xz kernel-qcow2-linux-d790d4d583aeaed9fc6f8a9f4d9f8ce6b1c15c7f.zip | |
Merge branch 'master' into for-next
Diffstat (limited to 'include/linux/net.h')
| -rw-r--r-- | include/linux/net.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/net.h b/include/linux/net.h index 2b4deeeb8646..dee0b11a8759 100644 --- a/include/linux/net.h +++ b/include/linux/net.h @@ -129,10 +129,9 @@ struct socket_wq { * @type: socket type (%SOCK_STREAM, etc) * @flags: socket flags (%SOCK_ASYNC_NOSPACE, etc) * @ops: protocol specific socket operations - * @fasync_list: Asynchronous wake up list * @file: File back pointer for gc * @sk: internal networking protocol agnostic socket representation - * @wait: wait queue for several uses + * @wq: wait queue for several uses */ struct socket { socket_state state; |