Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
iproute2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
iproute2
Commits
0198930b
Commit
0198930b
authored
Nov 23, 2015
by
Stephen Hemminger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update kernel headers to 4.4-rc1
Post merge window changes
parent
f7b49a3f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
37 deletions
+9
-37
include/linux/bpf.h
include/linux/bpf.h
+8
-37
include/linux/if_link.h
include/linux/if_link.h
+1
-0
No files found.
include/linux/bpf.h
View file @
0198930b
...
@@ -63,50 +63,16 @@ struct bpf_insn {
...
@@ -63,50 +63,16 @@ struct bpf_insn {
__s32
imm
;
/* signed immediate constant */
__s32
imm
;
/* signed immediate constant */
};
};
/* BPF syscall commands */
/* BPF syscall commands
, see bpf(2) man-page for details.
*/
enum
bpf_cmd
{
enum
bpf_cmd
{
/* create a map with given type and attributes
* fd = bpf(BPF_MAP_CREATE, union bpf_attr *, u32 size)
* returns fd or negative error
* map is deleted when fd is closed
*/
BPF_MAP_CREATE
,
BPF_MAP_CREATE
,
/* lookup key in a given map
* err = bpf(BPF_MAP_LOOKUP_ELEM, union bpf_attr *attr, u32 size)
* Using attr->map_fd, attr->key, attr->value
* returns zero and stores found elem into value
* or negative error
*/
BPF_MAP_LOOKUP_ELEM
,
BPF_MAP_LOOKUP_ELEM
,
/* create or update key/value pair in a given map
* err = bpf(BPF_MAP_UPDATE_ELEM, union bpf_attr *attr, u32 size)
* Using attr->map_fd, attr->key, attr->value, attr->flags
* returns zero or negative error
*/
BPF_MAP_UPDATE_ELEM
,
BPF_MAP_UPDATE_ELEM
,
/* find and delete elem by key in a given map
* err = bpf(BPF_MAP_DELETE_ELEM, union bpf_attr *attr, u32 size)
* Using attr->map_fd, attr->key
* returns zero or negative error
*/
BPF_MAP_DELETE_ELEM
,
BPF_MAP_DELETE_ELEM
,
/* lookup key in a given map and return next key
* err = bpf(BPF_MAP_GET_NEXT_KEY, union bpf_attr *attr, u32 size)
* Using attr->map_fd, attr->key, attr->next_key
* returns zero and stores next key or negative error
*/
BPF_MAP_GET_NEXT_KEY
,
BPF_MAP_GET_NEXT_KEY
,
/* verify and load eBPF program
* prog_fd = bpf(BPF_PROG_LOAD, union bpf_attr *attr, u32 size)
* Using attr->prog_type, attr->insns, attr->license
* returns fd or negative error
*/
BPF_PROG_LOAD
,
BPF_PROG_LOAD
,
BPF_OBJ_PIN
,
BPF_OBJ_GET
,
};
};
enum
bpf_map_type
{
enum
bpf_map_type
{
...
@@ -160,6 +126,11 @@ union bpf_attr {
...
@@ -160,6 +126,11 @@ union bpf_attr {
__aligned_u64
log_buf
;
/* user supplied buffer */
__aligned_u64
log_buf
;
/* user supplied buffer */
__u32
kern_version
;
/* checked when prog_type=kprobe */
__u32
kern_version
;
/* checked when prog_type=kprobe */
};
};
struct
{
/* anonymous struct used by BPF_OBJ_* commands */
__aligned_u64
pathname
;
__u32
bpf_fd
;
};
}
__attribute__
((
aligned
(
8
)));
}
__attribute__
((
aligned
(
8
)));
/* integer value in 'imm' field of BPF_CALL instruction selects which helper
/* integer value in 'imm' field of BPF_CALL instruction selects which helper
...
...
include/linux/if_link.h
View file @
0198930b
...
@@ -459,6 +459,7 @@ enum {
...
@@ -459,6 +459,7 @@ enum {
IFLA_GENEVE_TOS
,
IFLA_GENEVE_TOS
,
IFLA_GENEVE_PORT
,
/* destination port */
IFLA_GENEVE_PORT
,
/* destination port */
IFLA_GENEVE_COLLECT_METADATA
,
IFLA_GENEVE_COLLECT_METADATA
,
IFLA_GENEVE_REMOTE6
,
__IFLA_GENEVE_MAX
__IFLA_GENEVE_MAX
};
};
#define IFLA_GENEVE_MAX (__IFLA_GENEVE_MAX - 1)
#define IFLA_GENEVE_MAX (__IFLA_GENEVE_MAX - 1)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment