Skip to contentSkip to conversation

tcp: fix compile error if !CONFIG_SYSCTL

PATCH Applied Eric Dumazet 2 participants 2 messages Jun 15, 2019 – Jun 16, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tcp: fix compile error if !CONFIG_SYSCTL

tcp_tx_skb_cache_key and tcp_rx_skb_cache_key must be available even if CONFIG_SYSCTL is not set.

Fixes 0b7d7f6b2208 ("tcp: add tcp_tx_skb_cache sysctl")
Fixes ede61ca474a0 ("tcp: add tcp_rx_skb_cache sysctl")
---
 net/ipv4/sysctl_net_ipv4.c | 5 -----
 net/ipv4/tcp.c             | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)
net/ipv4/sysctl_net_ipv4.c +0 -5
index 08a428a7b2749c4f2a03aa6352e44c053596ef75..fa213bd8e233b577114815ca2227f08264e7df06 100644
@@ -51,11 +51,6 @@ static int comp_sack_nr_max = 255;
 static u32 u32_max_div_HZ = UINT_MAX / HZ;
 static int one_day_secs = 24 * 3600;
 
-DEFINE_STATIC_KEY_FALSE(tcp_rx_skb_cache_key);
-EXPORT_SYMBOL(tcp_rx_skb_cache_key);
-
-DEFINE_STATIC_KEY_FALSE(tcp_tx_skb_cache_key);
-
 /* obsolete */
 static int sysctl_tcp_low_latency __read_mostly;
 
net/ipv4/tcp.c +5 -0
index f12d500ec85cf770b0b94cb5e08d16f77e4c126b..f448a288d158c4baa6d8d5ed82c4b129404233a1 100644
@@ -317,6 +317,11 @@ struct tcp_splice_state {
 unsigned long tcp_memory_pressure __read_mostly;
 EXPORT_SYMBOL_GPL(tcp_memory_pressure);
 
+DEFINE_STATIC_KEY_FALSE(tcp_rx_skb_cache_key);
+EXPORT_SYMBOL(tcp_rx_skb_cache_key);
+
+DEFINE_STATIC_KEY_FALSE(tcp_tx_skb_cache_key);
+
 void tcp_enter_memory_pressure(struct sock *sk)
 {
 	unsigned long val;
Signature · 1 line
2.22.0.410.gd8fdbe21b5-goog