aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/sock.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/core/sock.c')
-rw-r--r--net/core/sock.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/sock.c b/net/core/sock.c
index a753d97434dc..83667de45ec9 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -901,7 +901,7 @@ set_rcvbuf:
901 sock_valbool_flag(sk, SOCK_SELECT_ERR_QUEUE, valbool); 901 sock_valbool_flag(sk, SOCK_SELECT_ERR_QUEUE, valbool);
902 break; 902 break;
903 903
904#ifdef CONFIG_NET_LL_RX_POLL 904#ifdef CONFIG_NET_RX_BUSY_POLL
905 case SO_BUSY_POLL: 905 case SO_BUSY_POLL:
906 /* allow unprivileged users to decrease the value */ 906 /* allow unprivileged users to decrease the value */
907 if ((val > sk->sk_ll_usec) && !capable(CAP_NET_ADMIN)) 907 if ((val > sk->sk_ll_usec) && !capable(CAP_NET_ADMIN))
@@ -1171,7 +1171,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
1171 v.val = sock_flag(sk, SOCK_SELECT_ERR_QUEUE); 1171 v.val = sock_flag(sk, SOCK_SELECT_ERR_QUEUE);
1172 break; 1172 break;
1173 1173
1174#ifdef CONFIG_NET_LL_RX_POLL 1174#ifdef CONFIG_NET_RX_BUSY_POLL
1175 case SO_BUSY_POLL: 1175 case SO_BUSY_POLL:
1176 v.val = sk->sk_ll_usec; 1176 v.val = sk->sk_ll_usec;
1177 break; 1177 break;
@@ -2312,7 +2312,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
2312 2312
2313 sk->sk_stamp = ktime_set(-1L, 0); 2313 sk->sk_stamp = ktime_set(-1L, 0);
2314 2314
2315#ifdef CONFIG_NET_LL_RX_POLL 2315#ifdef CONFIG_NET_RX_BUSY_POLL
2316 sk->sk_napi_id = 0; 2316 sk->sk_napi_id = 0;
2317 sk->sk_ll_usec = sysctl_net_busy_read; 2317 sk->sk_ll_usec = sysctl_net_busy_read;
2318#endif 2318#endif