matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into next 

Signed-off-by: David Ahern <dsahern@gmail.com>
This commit is contained in:
David Ahern 2019-09-04 07:48:15 -07:00
parent efaef0be95 98631f134d
commit 1a5141715e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/uapi/linux/bpf.h
View File

@ -1467,8 +1467,8 @@ union bpf_attr {
* If no cookie has been set yet, generate a new cookie. Once * If no cookie has been set yet, generate a new cookie. Once
* generated, the socket cookie remains stable for the life of the * generated, the socket cookie remains stable for the life of the
* socket. This helper can be useful for monitoring per socket * socket. This helper can be useful for monitoring per socket
* networking traffic statistics as it provides a unique socket * networking traffic statistics as it provides a global socket
* identifier per namespace. * identifier that can be assumed unique.
* Return * Return
* A 8-byte long non-decreasing number on success, or 0 if the * A 8-byte long non-decreasing number on success, or 0 if the
* socket field is missing inside *skb*. * socket field is missing inside *skb*.