tcp: fix compile error if !CONFIG_SYSCTL
Subsystems (3)
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")
Signed-off-by Eric Dumazet <[email protected]>
Reported-by Willem de Bruijn <[email protected]>
--- 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
@@ -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
@@ -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
From: Eric Dumazet <[email protected]>
Date: Sat, 15 Jun 2019 13:19:55 -0700
Quoted 7 lines
tcp_tx_skb_cache_keyandtcp_rx_skb_cache_keymust be available even ifCONFIG_SYSCTLis 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 <[email protected]>Reported-by Willem de Bruijn <[email protected]>
Applied.