summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-12-19 00:04:52 +0300
committerDavid S. Miller <davem@davemloft.net>2015-12-19 00:04:52 +0300
commitd73e5f41462182053ce1195c3fc4fc14a7e7666b (patch)
tree65e6968c6abb453dbcde2c6f0d981912ea6a3f51 /include
parent59ce9670ce18d067433883adf213d04ded074cbf (diff)
parent9dd2af834dea132fa47b9a168d6da566d2e445d3 (diff)
downloadlinux-d73e5f41462182053ce1195c3fc4fc14a7e7666b.tar.xz
Merge branch 'bpf-misc-updates'
Daniel Borkmann says: ==================== Misc BPF updates This series contains a couple of misc updates to the BPF code, besides others a new helper bpf_skb_load_bytes(), moving clearing of A/X to the classic converter, etc. Please see individual patches for details. Thanks! ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/uapi/linux/bpf.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 9ea2d22fa2cb..8bed7f1176b8 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -269,6 +269,7 @@ enum bpf_func_id {
* Return: 0 on success
*/
BPF_FUNC_perf_event_output,
+ BPF_FUNC_skb_load_bytes,
__BPF_FUNC_MAX_ID,
};