Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[linux-2.6-microblaze.git] / include / linux / net.h

diff --git a/include/linux/net.h b/include/linux/net.h
index f7d672c..9cafb5f 100644 (file)
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -116,11 +116,11 @@ struct socket {
 
        unsigned long           flags;
 
-       struct socket_wq        *wq;
-
        struct file             *file;
        struct sock             *sk;
        const struct proto_ops  *ops;
+
+       struct socket_wq        wq;
 };
 
 struct vm_area_struct;