diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-04-22 21:35:55 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-22 21:35:55 -0700 |
| commit | 2843ba2ec75948e274d2c4f0a9390980e68a6461 (patch) | |
| tree | b2fde70246956609ac43ad62026a4fdb48e33fbc /include/linux/skbuff.h | |
| parent | ipv6: Restore RTF_ADDRCONF check in rt6_qualify_for_ecmp (diff) | |
| parent | Merge branch 'bpf-verifier-lock' (diff) | |
| download | linux-dev-2843ba2ec75948e274d2c4f0a9390980e68a6461.tar.xz linux-dev-2843ba2ec75948e274d2c4f0a9390980e68a6461.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
Alexei Starovoitov says:
====================
pull-request: bpf-next 2019-04-22
The following pull-request contains BPF updates for your *net-next* tree.
The main changes are:
1) allow stack/queue helpers from more bpf program types, from Alban.
2) allow parallel verification of root bpf programs, from Alexei.
3) introduce bpf sysctl hook for trusted root cases, from Andrey.
4) recognize var/datasec in btf deduplication, from Andrii.
5) cpumap performance optimizations, from Jesper.
6) verifier prep for alu32 optimization, from Jiong.
7) libbpf xsk cleanup, from Magnus.
8) other various fixes and cleanups.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/skbuff.h')
| -rw-r--r-- | include/linux/skbuff.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index e4ee92089dd6..6f42942a443b 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -1042,6 +1042,8 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t priority, int flags, int node); struct sk_buff *__build_skb(void *data, unsigned int frag_size); struct sk_buff *build_skb(void *data, unsigned int frag_size); +struct sk_buff *build_skb_around(struct sk_buff *skb, + void *data, unsigned int frag_size); /** * alloc_skb - allocate a network buffer |