projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c8086f6
c6c3345
)
Merge branch 'bpf-next'
author
David S. Miller
<
[email protected]
>
Mon, 11 Jan 2016 22:32:56 +0000
(17:32 -0500)
committer
David S. Miller
<
[email protected]
>
Mon, 11 Jan 2016 22:32:56 +0000
(17:32 -0500)
Daniel Borkmann says:
====================
BPF update
This set adds IPv6 support for bpf_skb_{set,get}_tunnel_key() helper.
It also exports flags to user space that are being used in helpers and
weren't exported thus far. For more details, please see the individual
patches.
====================
Signed-off-by: David S. Miller <
[email protected]
>
Trivial merge