1 files changed, 26 insertions, 2 deletions

diff --git a/include/net/sock.h b/include/net/sock.h
index fd9876087651..b433b1ed203d 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -70,7 +70,11 @@
 #define SOCK_DEBUG(sk, msg...) do { if ((sk) && sock_flag((sk), SOCK_DBG)) \
                                         printk(KERN_DEBUG msg); } while (0)
 #else
-#define SOCK_DEBUG(sk, msg...) do { } while (0)
+/* Validate arguments and do nothing */
+static void inline int __attribute__ ((format (printf, 2, 3)))
+SOCK_DEBUG(struct sock *sk, const char *msg, ...)
+{
+}
 #endif
 
 /* This is the per-socket lock.  The spinlock provides a synchronization
@@ -151,6 +155,7 @@ struct sock_common {
   *     @sk_no_check: %SO_NO_CHECK setting, wether or not checkup packets
   *     @sk_route_caps: route capabilities (e.g. %NETIF_F_TSO)
   *     @sk_gso_type: GSO type (e.g. %SKB_GSO_TCPV4)
+  *     @sk_gso_max_size: Maximum GSO segment size to build
   *     @sk_lingertime: %SO_LINGER l_linger setting
   *     @sk_backlog: always used with the per-socket spinlock held
   *     @sk_callback_lock: used with the callbacks in the end of this struct
@@ -237,6 +242,7 @@ struct sock {
         gfp_t                   sk_allocation;
         int                     sk_route_caps;
         int                     sk_gso_type;
+        unsigned int            sk_gso_max_size;
         int                     sk_rcvlowat;
         unsigned long           sk_flags;
         unsigned long           sk_lingertime;
@@ -498,6 +504,7 @@ extern int sk_wait_data(struct sock *sk, long *timeo);
 struct request_sock_ops;
 struct timewait_sock_ops;
 struct inet_hashinfo;
+struct raw_hashinfo;
 
 /* Networking protocol blocks we attach to sockets.
  * socket layer -> transport layer interface
@@ -580,7 +587,11 @@ struct proto {
         struct request_sock_ops *rsk_prot;
         struct timewait_sock_ops *twsk_prot;
 
-        struct inet_hashinfo    *hashinfo;
+        union {
+                struct inet_hashinfo    *hashinfo;
+                struct hlist_head       *udp_hash;
+                struct raw_hashinfo     *raw_hash;
+        } h;
 
         struct module           *owner;
 
@@ -850,6 +861,7 @@ extern struct sock		*sk_alloc(struct net *net, int family,
                                           gfp_t priority,
                                           struct proto *prot);
 extern void                     sk_free(struct sock *sk);
+extern void                     sk_release_kernel(struct sock *sk);
 extern struct sock              *sk_clone(const struct sock *sk,
                                           const gfp_t priority);
 
@@ -1333,6 +1345,18 @@ static inline void sk_eat_skb(struct sock *sk, struct sk_buff *skb, int copied_e
 }
 #endif
 
+/*
+ * Kernel sockets, f.e. rtnl or icmp_socket, are a part of a namespace.
+ * They should not hold a referrence to a namespace in order to allow
+ * to stop it.
+ * Sockets after sk_change_net should be released using sk_release_kernel
+ */
+static inline void sk_change_net(struct sock *sk, struct net *net)
+{
+        put_net(sk->sk_net);
+        sk->sk_net = net;
+}
+
 extern void sock_enable_timestamp(struct sock *sk);
 extern int sock_get_timestamp(struct sock *, struct timeval __user *);
 extern int sock_get_timestampns(struct sock *, struct timespec __user *);