nvme-tcp: Initialize sk->sk_ll_usec only with NET_RX_BUSY_POLL
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>
Thu, 10 Oct 2019 15:34:12 +0000 (17:34 +0200)
committerKeith Busch <kbusch@kernel.org>
Mon, 14 Oct 2019 14:27:01 +0000 (23:27 +0900)
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: 1a9460cef5711 ("nvme-tcp: support simple polling")
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Keith Busch <kbusch@kernel.org>
drivers/nvme/host/tcp.c

index 33de2fddfbb2f14694dc9391f6ac2ac4d51ac1b5..820dac10fa9e97caf6e305df31031657c8198611 100644 (file)
@@ -1386,7 +1386,9 @@ static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl,
        queue->sock->sk->sk_data_ready = nvme_tcp_data_ready;
        queue->sock->sk->sk_state_change = nvme_tcp_state_change;
        queue->sock->sk->sk_write_space = nvme_tcp_write_space;
+#ifdef CONFIG_NET_RX_BUSY_POLL
        queue->sock->sk->sk_ll_usec = 1;
+#endif
        write_unlock_bh(&queue->sock->sk->sk_callback_lock);
 
        return 0;