Merge branch 'tc-action-identifier-consistency'

Browse source

Eli Cohen says:

====================
Change tc action identifiers to be more consistent

This two patch series modifies TC actions identifiers to be more consistent and
also puts them in one place so new identifiers numbers can be chosen more
easily.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2019-02-10 09:28:43 -08:00

parent 99c864667c eddd2cf195

commit 193dad2abb

42 changed files with 70 additions and 63 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

2

include/net/act_api.h

View file

2

include/net/tc_act/tc_csum.h

View file

2

include/net/tc_act/tc_gact.h

View file

4

include/net/tc_act/tc_mirred.h

View file

2

include/net/tc_act/tc_pedit.h

View file

2

include/net/tc_act/tc_sample.h

View file

2

include/net/tc_act/tc_skbedit.h

View file

4

include/net/tc_act/tc_tunnel_key.h

View file

2

include/net/tc_act/tc_vlan.h

View file

45

include/uapi/linux/pkt_cls.h

View file

2

include/uapi/linux/tc_act/tc_bpf.h

View file

2

include/uapi/linux/tc_act/tc_connmark.h

View file

2

include/uapi/linux/tc_act/tc_csum.h

View file

1

include/uapi/linux/tc_act/tc_gact.h

View file

1

include/uapi/linux/tc_act/tc_ife.h

View file

3

include/uapi/linux/tc_act/tc_ipt.h

View file

1

include/uapi/linux/tc_act/tc_mirred.h

View file

2

include/uapi/linux/tc_act/tc_nat.h

View file

2

include/uapi/linux/tc_act/tc_pedit.h

View file

2

include/uapi/linux/tc_act/tc_sample.h

View file

2

include/uapi/linux/tc_act/tc_skbedit.h

View file

2

include/uapi/linux/tc_act/tc_skbmod.h

View file

2

include/uapi/linux/tc_act/tc_tunnel_key.h

View file

2

include/uapi/linux/tc_act/tc_vlan.h

View file

2

net/sched/act_api.c

View file

2

net/sched/act_bpf.c

View file

2

net/sched/act_connmark.c

View file

2

net/sched/act_csum.c

View file

2

net/sched/act_gact.c

View file

2

net/sched/act_ife.c

View file

4

net/sched/act_ipt.c

View file

2

net/sched/act_mirred.c

View file

2

net/sched/act_nat.c

View file

2

net/sched/act_pedit.c

View file

2

net/sched/act_police.c

View file

2

net/sched/act_sample.c

View file

4

net/sched/act_simple.c

View file

2

net/sched/act_skbedit.c

View file

2

net/sched/act_skbmod.c

View file

2

net/sched/act_tunnel_key.c

View file

2

net/sched/act_vlan.c

View file

2

tools/include/uapi/linux/tc_act/tc_bpf.h

View file