diff options
| author | David S. Miller <davem@davemloft.net> | 2021-04-02 20:03:07 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-04-02 20:03:07 +0200 |
| commit | c2bcb4cf021121d7c162e44b7773281891e3abc2 (patch) | |
| tree | 8f37f13ff2292f0435cd523507d40b7a384cb8c6 /net/ipv6/udp.c | |
| parent | net: usb: ax88179_178a: initialize local variables before use (diff) | |
| parent | Merge branch 'sockmap: introduce BPF_SK_SKB_VERDICT and support UDP' (diff) | |
| download | linux-c2bcb4cf021121d7c162e44b7773281891e3abc2.tar.xz linux-c2bcb4cf021121d7c162e44b7773281891e3abc2.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
Alexei Starovoitov says:
====================
pull-request: bpf-next 2021-04-01
The following pull-request contains BPF updates for your *net-next* tree.
We've added 68 non-merge commits during the last 7 day(s) which contain
a total of 70 files changed, 2944 insertions(+), 1139 deletions(-).
The main changes are:
1) UDP support for sockmap, from Cong.
2) Verifier merge conflict resolution fix, from Daniel.
3) xsk selftests enhancements, from Maciej.
4) Unstable helpers aka kernel func calling, from Martin.
5) Batches ops for LPM map, from Pedro.
6) Fix race in bpf_get_local_storage, from Yonghong.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/udp.c')
| -rw-r--r-- | net/ipv6/udp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index fa2f54738392..199b080d418a 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -1714,6 +1714,9 @@ struct proto udpv6_prot = { .unhash = udp_lib_unhash, .rehash = udp_v6_rehash, .get_port = udp_v6_get_port, +#ifdef CONFIG_BPF_SYSCALL + .psock_update_sk_prot = udp_bpf_update_proto, +#endif .memory_allocated = &udp_memory_allocated, .sysctl_mem = sysctl_udp_mem, .sysctl_wmem_offset = offsetof(struct net, ipv4.sysctl_udp_wmem_min), |