Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Eric Dumazet and committed by
David S. Miller
2e05fcae d424a2af

+5 -5
-5
net/ipv4/sysctl_net_ipv4.c
··· 51 51 static u32 u32_max_div_HZ = UINT_MAX / HZ; 52 52 static int one_day_secs = 24 * 3600; 53 53 54 - DEFINE_STATIC_KEY_FALSE(tcp_rx_skb_cache_key); 55 - EXPORT_SYMBOL(tcp_rx_skb_cache_key); 56 - 57 - DEFINE_STATIC_KEY_FALSE(tcp_tx_skb_cache_key); 58 - 59 54 /* obsolete */ 60 55 static int sysctl_tcp_low_latency __read_mostly; 61 56
+5
net/ipv4/tcp.c
··· 317 317 unsigned long tcp_memory_pressure __read_mostly; 318 318 EXPORT_SYMBOL_GPL(tcp_memory_pressure); 319 319 320 + DEFINE_STATIC_KEY_FALSE(tcp_rx_skb_cache_key); 321 + EXPORT_SYMBOL(tcp_rx_skb_cache_key); 322 + 323 + DEFINE_STATIC_KEY_FALSE(tcp_tx_skb_cache_key); 324 + 320 325 void tcp_enter_memory_pressure(struct sock *sk) 321 326 { 322 327 unsigned long val;