diff options
author | 2018-10-08 09:48:31 +0200 | |
---|---|---|
committer | 2018-10-08 09:48:36 +0200 | |
commit | 188de5dd80b2b7986e75821374efb67081049b6e (patch) | |
tree | 545bbc0fdb58f30c0175128e3b5a9c00c89e2020 /include/net/udp.h | |
parent | cfg80211: sort tracing properly (diff) | |
parent | net: vhost: remove bad code line (diff) | |
download | linux-dev-188de5dd80b2b7986e75821374efb67081049b6e.tar.xz linux-dev-188de5dd80b2b7986e75821374efb67081049b6e.zip |
Merge remote-tracking branch 'net-next/master' into mac80211-next
Merge net-next, which pulled in net, so I can merge a few more
patches that would otherwise conflict.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/net/udp.h')
-rw-r--r-- | include/net/udp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/udp.h b/include/net/udp.h index 8482a990b0bb..9e82cb391dea 100644 --- a/include/net/udp.h +++ b/include/net/udp.h @@ -443,8 +443,10 @@ int udpv4_offload_init(void); void udp_init(void); +DECLARE_STATIC_KEY_FALSE(udp_encap_needed_key); void udp_encap_enable(void); #if IS_ENABLED(CONFIG_IPV6) +DECLARE_STATIC_KEY_FALSE(udpv6_encap_needed_key); void udpv6_encap_enable(void); #endif |