Skip to content

Commit ac1c4e1

Browse files
Sebastian Andrzej Siewiorkeithbusch
authored andcommitted
nvme-tcp: Initialize sk->sk_ll_usec only with NET_RX_BUSY_POLL
The access to sk->sk_ll_usec should be hidden behind CONFIG_NET_RX_BUSY_POLL like the definition of sk_ll_usec. Put access to ->sk_ll_usec behind CONFIG_NET_RX_BUSY_POLL. Fixes: 1a9460c ("nvme-tcp: support simple polling") Reviewed-by: Christoph Hellwig <[email protected]> Signed-off-by: Sebastian Andrzej Siewior <[email protected]> Signed-off-by: Keith Busch <[email protected]>
1 parent c1ac9a4 commit ac1c4e1

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

drivers/nvme/host/tcp.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1386,7 +1386,9 @@ static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl,
13861386
queue->sock->sk->sk_data_ready = nvme_tcp_data_ready;
13871387
queue->sock->sk->sk_state_change = nvme_tcp_state_change;
13881388
queue->sock->sk->sk_write_space = nvme_tcp_write_space;
1389+
#ifdef CONFIG_NET_RX_BUSY_POLL
13891390
queue->sock->sk->sk_ll_usec = 1;
1391+
#endif
13901392
write_unlock_bh(&queue->sock->sk->sk_callback_lock);
13911393

13921394
return 0;

0 commit comments

Comments
 (0)