1 files changed, 26 insertions, 0 deletions

diff --git a/net/core/sock.c b/net/core/sock.c
index d6d024cfaaaf..ab06b719f5b1 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -139,6 +139,8 @@
 #include <net/tcp.h>
 #endif
 
+#include <net/ll_poll.h>
+
 static DEFINE_MUTEX(proto_list_mutex);
 static LIST_HEAD(proto_list);
 
@@ -898,6 +900,19 @@ set_rcvbuf:
                 sock_valbool_flag(sk, SOCK_SELECT_ERR_QUEUE, valbool);
                 break;
 
+#ifdef CONFIG_NET_LL_RX_POLL
+        case SO_LL:
+                /* allow unprivileged users to decrease the value */
+                if ((val > sk->sk_ll_usec) && !capable(CAP_NET_ADMIN))
+                        ret = -EPERM;
+                else {
+                        if (val < 0)
+                                ret = -EINVAL;
+                        else
+                                sk->sk_ll_usec = val;
+                }
+                break;
+#endif
         default:
                 ret = -ENOPROTOOPT;
                 break;
@@ -1155,6 +1170,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
                 v.val = sock_flag(sk, SOCK_SELECT_ERR_QUEUE);
                 break;
 
+#ifdef CONFIG_NET_LL_RX_POLL
+        case SO_LL:
+                v.val = sk->sk_ll_usec;
+                break;
+#endif
+
         default:
                 return -ENOPROTOOPT;
         }
@@ -2271,6 +2292,11 @@ void sock_init_data(struct socket *sock, struct sock *sk)
 
         sk->sk_stamp = ktime_set(-1L, 0);
 
+#ifdef CONFIG_NET_LL_RX_POLL
+        sk->sk_napi_id          =       0;
+        sk->sk_ll_usec          =       sysctl_net_ll_read;
+#endif
+
         /*
          * Before updating sk_refcnt, we must commit prior changes to memory
          * (Documentation/RCU/rculist_nulls.txt for details)