History

bpf: fix up uapi helper description and sync bpf header with tools

Minor markup fixup from bpf-next into net-next merge in the BPF helper description of bpf_sk_lookup_tcp() and bpf_sk_lookup_udp(). Also sync up the copy of bpf.h from tooling infrastructure.

Daniel Borkmann committed 7 years ago

Commit 0bd72111 parent addb0672 files · +50 −49Browse files

Showing the changes to include/uapi/linux (1 of 2 files). Show all

Unified · Split

include/uapi/linux/bpf.h+6−6
@@ -2218,9 +2218,9 @@ union bpf_attr { · 2217 unmodified lines
2218 * This helper is available only if the kernel was compiled with2218 * This helper is available only if the kernel was compiled with
2219 * **CONFIG_NET** configuration option.2219 * **CONFIG_NET** configuration option.
2220 * Return2220 * Return
2221 * Pointer to *struct bpf_sock*, or NULL in case of failure.2221 * Pointer to **struct bpf_sock**, or **NULL** in case of failure.
2222 * For sockets with reuseport option, the *struct bpf_sock*2222 * For sockets with reuseport option, the **struct bpf_sock**
2223 * result is from reuse->socks[] using the hash of the tuple.2223 * result is from **reuse->socks**\ [] using the hash of the tuple.
2224 *2224 *
2225 * struct bpf_sock *bpf_sk_lookup_udp(void *ctx, struct bpf_sock_tuple *tuple, u32 tuple_size, u64 netns, u64 flags)2225 * struct bpf_sock *bpf_sk_lookup_udp(void *ctx, struct bpf_sock_tuple *tuple, u32 tuple_size, u64 netns, u64 flags)
2226 * Description2226 * Description
@@ -2254,9 +2254,9 @@ union bpf_attr { · 27 unmodified lines
2254 * This helper is available only if the kernel was compiled with2254 * This helper is available only if the kernel was compiled with
2255 * **CONFIG_NET** configuration option.2255 * **CONFIG_NET** configuration option.
2256 * Return2256 * Return
2257 * Pointer to *struct bpf_sock*, or NULL in case of failure.2257 * Pointer to **struct bpf_sock**, or **NULL** in case of failure.
2258 * For sockets with reuseport option, the *struct bpf_sock*2258 * For sockets with reuseport option, the **struct bpf_sock**
2259 * result is from reuse->socks[] using the hash of the tuple.2259 * result is from **reuse->socks**\ [] using the hash of the tuple.
2260 *2260 *
2261 * int bpf_sk_release(struct bpf_sock *sock)2261 * int bpf_sk_release(struct bpf_sock *sock)
2262 * Description2262 * Description

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t