diff options
author | Andi Kleen <ak@linux.intel.com> | 2008-07-22 00:16:54 +0200 |
---|---|---|
committer | Andi Kleen <ak@linux.intel.com> | 2008-07-22 00:16:54 +0200 |
commit | 8294fafdafc602ed11f401c44628fab8558c5cf5 (patch) | |
tree | c8d0371cfd05226b56d52bfde9c69f8caca4501d /include/linux/net.h | |
parent | 725c3a2d70f958adee807c178178819a50f68a56 (diff) | |
parent | bf20e740a4bcc686de02e2fd1c1810a58872f46e (diff) |
Merge branch 'for-upstream/acpi-test' of git://repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6 into release-2.6.27
Diffstat (limited to 'include/linux/net.h')
-rw-r--r-- | include/linux/net.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/net.h b/include/linux/net.h index 71f7dd559285..150a48c68d52 100644 --- a/include/linux/net.h +++ b/include/linux/net.h @@ -106,23 +106,23 @@ enum sock_shutdown_cmd { /** * struct socket - general BSD socket * @state: socket state (%SS_CONNECTED, etc) + * @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 - * @type: socket type (%SOCK_STREAM, etc) */ struct socket { socket_state state; + short type; unsigned long flags; const struct proto_ops *ops; struct fasync_struct *fasync_list; struct file *file; struct sock *sk; wait_queue_head_t wait; - short type; }; struct vm_area_struct; |