From 82db9f934e4e5f0369843091c2d3ec8386b63ab9 Mon Sep 17 00:00:00 2001 From: Richard Kennedy Date: Tue, 8 Jul 2008 03:03:01 -0700 Subject: [PATCH] --- yaml --- r: 103332 b: refs/heads/master c: 2c693610fe923764fe41b846fb86938a2010da6e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/net.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2d3861258c9d..d22181d78ab9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4ad3f26162ece5aca3045fd45e15dd99acea4a0e +refs/heads/master: 2c693610fe923764fe41b846fb86938a2010da6e diff --git a/trunk/include/linux/net.h b/trunk/include/linux/net.h index 71f7dd559285..150a48c68d52 100644 --- a/trunk/include/linux/net.h +++ b/trunk/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;