3 files changed, 9 insertions, 9 deletions

diff --git a/net/core/sock.c b/net/core/sock.c
index 9bfe83f4d670..548d716c5f62 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -901,7 +901,7 @@ set_rcvbuf:
                 break;
 
 #ifdef CONFIG_NET_LL_RX_POLL
-        case SO_LL:
+        case SO_BUSY_POLL:
                 /* allow unprivileged users to decrease the value */
                 if ((val > sk->sk_ll_usec) && !capable(CAP_NET_ADMIN))
                         ret = -EPERM;
@@ -1171,7 +1171,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
                 break;
 
 #ifdef CONFIG_NET_LL_RX_POLL
-        case SO_LL:
+        case SO_BUSY_POLL:
                 v.val = sk->sk_ll_usec;
                 break;
 #endif
@@ -2294,7 +2294,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
 
 #ifdef CONFIG_NET_LL_RX_POLL
         sk->sk_napi_id          =       0;
-        sk->sk_ll_usec          =       sysctl_net_ll_read;
+        sk->sk_ll_usec          =       sysctl_net_busy_read;
 #endif
 
         /*
diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
index 1a298cb3daee..660968616637 100644
--- a/net/core/sysctl_net_core.c
+++ b/net/core/sysctl_net_core.c
@@ -300,15 +300,15 @@ static struct ctl_table net_core_table[] = {
 #endif /* CONFIG_NET_FLOW_LIMIT */
 #ifdef CONFIG_NET_LL_RX_POLL
         {
-                .procname       = "low_latency_poll",
-                .data           = &sysctl_net_ll_poll,
+                .procname       = "busy_poll",
+                .data           = &sysctl_net_busy_poll,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec
         },
         {
-                .procname       = "low_latency_read",
-                .data           = &sysctl_net_ll_read,
+                .procname       = "busy_read",
+                .data           = &sysctl_net_busy_read,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec
diff --git a/net/socket.c b/net/socket.c
index 6a3e9a3f50ad..829b460acb87 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -107,8 +107,8 @@
 #include <net/busy_poll.h>
 
 #ifdef CONFIG_NET_LL_RX_POLL
-unsigned int sysctl_net_ll_read __read_mostly;
-unsigned int sysctl_net_ll_poll __read_mostly;
+unsigned int sysctl_net_busy_read __read_mostly;
+unsigned int sysctl_net_busy_poll __read_mostly;
 #endif
 
 static int sock_no_open(struct inode *irrelevant, struct file *dontcare);