Merge branch 'net-sched-support-vxlan-and-erspan-options'

Browse source

Xin Long says:

====================
net: sched: support vxlan and erspan options

This patchset is to add vxlan and erspan options support in
cls_flower and act_tunnel_key. The form is pretty much like
geneve_opts in:

  https://patchwork.ozlabs.org/patch/935272/
  https://patchwork.ozlabs.org/patch/954564/

but only one option is allowed for vxlan and erspan.

v1->v2:
  - see each patch changelog.
====================

Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2019-11-21 11:44:06 -08:00

parent 0617aa988d 79b1011cb3

commit ff998a80c3

4 changed files with 514 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

29

include/uapi/linux/pkt_cls.h

View file

29

include/uapi/linux/tc_act/tc_tunnel_key.h

View file

203

net/sched/act_tunnel_key.c

View file

254

net/sched/cls_flower.c

View file