net: rename CONFIG_NET_LL_RX_POLL to CONFIG_NET_RX_BUSY_POLL

[linux-imx.git] / net / core / sock.c

diff --git a/net/core/sock.c b/net/core/sock.c
index ab06b719f5b1132e73dce818be80fe5e0cd1b8c5..2c097c5a35dd8550d8a3041ae41e6afec35bf48b 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -139,7 +139,7 @@
 #include <net/tcp.h>
 #endif
 
-#include <net/ll_poll.h>
+#include <net/busy_poll.h>
 
 static DEFINE_MUTEX(proto_list_mutex);
 static LIST_HEAD(proto_list);
@@ -900,8 +900,8 @@ set_rcvbuf:
                sock_valbool_flag(sk, SOCK_SELECT_ERR_QUEUE, valbool);
                break;
 
-#ifdef CONFIG_NET_LL_RX_POLL
-       case SO_LL:
+#ifdef CONFIG_NET_RX_BUSY_POLL
+       case SO_BUSY_POLL:
                /* allow unprivileged users to decrease the value */
                if ((val > sk->sk_ll_usec) && !capable(CAP_NET_ADMIN))
                        ret = -EPERM;
@@ -1170,8 +1170,8 @@ 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:
+#ifdef CONFIG_NET_RX_BUSY_POLL
+       case SO_BUSY_POLL:
                v.val = sk->sk_ll_usec;
                break;
 #endif
@@ -2292,9 +2292,9 @@ void sock_init_data(struct socket *sock, struct sock *sk)
 
        sk->sk_stamp = ktime_set(-1L, 0);
 
-#ifdef CONFIG_NET_LL_RX_POLL
+#ifdef CONFIG_NET_RX_BUSY_POLL
        sk->sk_napi_id          =       0;
-       sk->sk_ll_usec          =       sysctl_net_ll_read;
+       sk->sk_ll_usec          =       sysctl_net_busy_read;
 #endif
 
        /*