summaryrefslogtreecommitdiffstats
path: root/include/uapi/linux/if_bridge.h
diff options
context:
space:
mode:
authorDavid S. Miller2016-06-30 11:54:48 +0200
committerDavid S. Miller2016-06-30 11:54:48 +0200
commit545c321ba3c524045ebc26f6c81b3ec3ba966836 (patch)
treed02f10ddd1ad1f4e5d280ab8e285f7ab450312fc /include/uapi/linux/if_bridge.h
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
parentbpf: add bpf_skb_change_type helper (diff)
downloadkernel-qcow2-linux-545c321ba3c524045ebc26f6c81b3ec3ba966836.tar.gz
kernel-qcow2-linux-545c321ba3c524045ebc26f6c81b3ec3ba966836.tar.xz
kernel-qcow2-linux-545c321ba3c524045ebc26f6c81b3ec3ba966836.zip
Merge branch 'bpf-helper-improvements'
Daniel Borkmann says: ==================== BPF helper improvements This set adds various BPF helper improvements, that is, cleaning up and adding BPF_F_CURRENT_CPU flag for tracing helper, allowing for preemption checks on bpf_get_smp_processor_id() helper, and adding two new helpers bpf_skb_change_{proto, type} for tc related programs. For further details please see individual patches. Note, this set requires -net to be merged into -net-next tree first. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi/linux/if_bridge.h')
0 files changed, 0 insertions, 0 deletions