]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
projects / mirror_ubuntu-artful-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f3120ac 4d9c5c5)
Merge branch 'bpf-push-pop-helpers'
authorDavid S. Miller <davem@davemloft.net>
Tue, 21 Jul 2015 03:52:32 +0000 (20:52 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 21 Jul 2015 03:52:32 +0000 (20:52 -0700)
commit500322ec418171a1d067cfd8a3b0fde4b6eb7257
tree0eeec6acd33f939f37b4b67722b4588d5a88b304tree
parentf3120acc7851bffd1cd15acd044b7fa6fa520e75commit | diff
parent4d9c5c53ac99e4cb5d031897863203d7817b36e0commit | diff
Merge branch 'bpf-push-pop-helpers'

Alexei Starovoitov says:

====================
bpf: introduce bpf_skb_vlan_push/pop() helpers

Let TC+eBPF programs call skb_vlan_push/pop via helpers.

v1->v2:
- reworded commit log to better explain correctness of re-caching
  and fixed comparison of mixed endiannes (suggested by Eric)
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
Ubuntu Artful kernel mirror