Merge branch 'master'; commit 'v2.6.38-rc7' into next

1 files changed, 6 insertions, 0 deletions

diff --git a/include/net/sock.h b/include/net/sock.h
index 21a02f7e4f45..bc1cf7d88ccb 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -152,14 +152,18 @@ struct sock_common {
          * fields between dontcopy_begin/dontcopy_end
          * are not copied in sock_copy()
          */
+        /* private: */
         int                     skc_dontcopy_begin[0];
+        /* public: */
         union {
                 struct hlist_node       skc_node;
                 struct hlist_nulls_node skc_nulls_node;
         };
         int                     skc_tx_queue_mapping;
         atomic_t                skc_refcnt;
+        /* private: */
         int                     skc_dontcopy_end[0];
+        /* public: */
 };
 
 /**
@@ -749,6 +753,8 @@ struct proto {
                                         int level,
                                         int optname, char __user *optval,
                                         int __user *option);
+        int                     (*compat_ioctl)(struct sock *sk,
+                                        unsigned int cmd, unsigned long arg);
 #endif
         int                     (*sendmsg)(struct kiocb *iocb, struct sock *sk,
                                            struct msghdr *msg, size_t len);