diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-07-29 14:59:59 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-07-29 14:59:59 -0700 |
| commit | b88d0a049084854aef0ea146f1411eafcd2597a8 (patch) | |
| tree | e4d0b2ed3dc2e6900106edff81e834f063007e1c /net/packet | |
| parent | net/mlx4_en: Hardware accelerated 802.1ad works only on the first port (diff) | |
| parent | s390/bpf: recache skb->data/hlen for skb_vlan_push/pop (diff) | |
| download | linux-dev-b88d0a049084854aef0ea146f1411eafcd2597a8.tar.xz linux-dev-b88d0a049084854aef0ea146f1411eafcd2597a8.zip | |
Merge branch 's390-bpf-push-pop'
Michael Holzheu says:
====================
s390/bpf: recache skb->data/hlen for skb_vlan_push/pop
Here the s390 backend for Alexei's patch 4e10df9a60d9 ("bpf: introduce
bpf_skb_vlan_push/pop() helpers") plus two bugfixes and two minor
improvements.
The first patch "s390/bpf: clear correct BPF accumulator register" will
also go upstream via Martin's "fixes" branch.
* v2: Integrated suggestions from Joe Perches
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/packet')
0 files changed, 0 insertions, 0 deletions