1 files changed, 39 insertions, 3 deletions

diff --git a/net/core/sock.c b/net/core/sock.c
index 4ed7b1d12f5e..16069139797c 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -125,6 +125,7 @@
 #include <net/xfrm.h>
 #include <linux/ipsec.h>
 #include <net/cls_cgroup.h>
+#include <net/netprio_cgroup.h>
 
 #include <linux/filter.h>
 
@@ -221,10 +222,16 @@ __u32 sysctl_rmem_default __read_mostly = SK_RMEM_MAX;
 int sysctl_optmem_max __read_mostly = sizeof(unsigned long)*(2*UIO_MAXIOV+512);
 EXPORT_SYMBOL(sysctl_optmem_max);
 
-#if defined(CONFIG_CGROUPS) && !defined(CONFIG_NET_CLS_CGROUP)
+#if defined(CONFIG_CGROUPS)
+#if !defined(CONFIG_NET_CLS_CGROUP)
 int net_cls_subsys_id = -1;
 EXPORT_SYMBOL_GPL(net_cls_subsys_id);
 #endif
+#if !defined(CONFIG_NETPRIO_CGROUP)
+int net_prio_subsys_id = -1;
+EXPORT_SYMBOL_GPL(net_prio_subsys_id);
+#endif
+#endif
 
 static int sock_set_timeout(long *timeo_p, char __user *optval, int optlen)
 {
@@ -740,6 +747,11 @@ set_rcvbuf:
         case SO_RXQ_OVFL:
                 sock_valbool_flag(sk, SOCK_RXQ_OVFL, valbool);
                 break;
+
+        case SO_WIFI_STATUS:
+                sock_valbool_flag(sk, SOCK_WIFI_STATUS, valbool);
+                break;
+
         default:
                 ret = -ENOPROTOOPT;
                 break;
@@ -961,6 +973,10 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
                 v.val = !!sock_flag(sk, SOCK_RXQ_OVFL);
                 break;
 
+        case SO_WIFI_STATUS:
+                v.val = !!sock_flag(sk, SOCK_WIFI_STATUS);
+                break;
+
         default:
                 return -ENOPROTOOPT;
         }
@@ -1111,6 +1127,18 @@ void sock_update_classid(struct sock *sk)
                 sk->sk_classid = classid;
 }
 EXPORT_SYMBOL(sock_update_classid);
+
+void sock_update_netprioidx(struct sock *sk)
+{
+        struct cgroup_netprio_state *state;
+        if (in_interrupt())
+                return;
+        rcu_read_lock();
+        state = task_netprio_state(current);
+        sk->sk_cgrp_prioidx = state ? state->prioidx : 0;
+        rcu_read_unlock();
+}
+EXPORT_SYMBOL_GPL(sock_update_netprioidx);
 #endif
 
 /**
@@ -1138,6 +1166,7 @@ struct sock *sk_alloc(struct net *net, int family, gfp_t priority,
                 atomic_set(&sk->sk_wmem_alloc, 1);
 
                 sock_update_classid(sk);
+                sock_update_netprioidx(sk);
         }
 
         return sk;
@@ -1204,7 +1233,14 @@ void sk_release_kernel(struct sock *sk)
 }
 EXPORT_SYMBOL(sk_release_kernel);
 
-struct sock *sk_clone(const struct sock *sk, const gfp_t priority)
+/**
+ *      sk_clone_lock - clone a socket, and lock its clone
+ *      @sk: the socket to clone
+ *      @priority: for allocation (%GFP_KERNEL, %GFP_ATOMIC, etc)
+ *
+ *      Caller must unlock socket even in error path (bh_unlock_sock(newsk))
+ */
+struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority)
 {
         struct sock *newsk;
 
@@ -1297,7 +1333,7 @@ struct sock *sk_clone(const struct sock *sk, const gfp_t priority)
 out:
         return newsk;
 }
-EXPORT_SYMBOL_GPL(sk_clone);
+EXPORT_SYMBOL_GPL(sk_clone_lock);
 
 void sk_setup_caps(struct sock *sk, struct dst_entry *dst)
 {