diff options
| author | David S. Miller <davem@davemloft.net> | 2018-08-18 10:02:49 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-08-18 10:02:49 -0700 |
| commit | 6e3bf9b04f79a009a7ff336ba7353ab565daaec8 (patch) | |
| tree | 12e5914158a802b7761b0b44d953ac06f6c51fcc /net/tls | |
| parent | 3fe49d699a9604eed851eb45e1e0adab0e25688e (diff) | |
| parent | f6069b9aa9934ede26f41ac0781fce241279ad43 (diff) | |
| download | linux-6e3bf9b04f79a009a7ff336ba7353ab565daaec8.tar.gz linux-6e3bf9b04f79a009a7ff336ba7353ab565daaec8.tar.bz2 linux-6e3bf9b04f79a009a7ff336ba7353ab565daaec8.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says:
====================
pull-request: bpf 2018-08-18
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) Fix a BPF selftest failure in test_cgroup_storage due to rlimit
restrictions, from Yonghong.
2) Fix a suspicious RCU rcu_dereference_check() warning triggered
from removing a device's XDP memory allocator by using the correct
rhashtable lookup function, from Tariq.
3) A batch of BPF sockmap and ULP fixes mainly fixing leaks and races
as well as enforcing module aliases for ULPs. Another fix for BPF
map redirect to make them work again with tail calls, from Daniel.
4) Fix XDP BPF samples to unload their programs upon SIGTERM, from Jesper.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tls')
| -rw-r--r-- | net/tls/tls_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index b09867c8b817..93c0c225ab34 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -45,6 +45,7 @@ MODULE_AUTHOR("Mellanox Technologies"); MODULE_DESCRIPTION("Transport Layer Security Support"); MODULE_LICENSE("Dual BSD/GPL"); +MODULE_ALIAS_TCP_ULP("tls"); enum { TLSV4, |