Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 257eeded authored by Eli Cohen's avatar Eli Cohen Committed by David S. Miller
Browse files

net: Move all TC actions identifiers to one place 



Move all the TC identifiers to one place, to the same enum that defines
the identifier of police action. This makes it easier choose numbers for
new actions since they are now defined in one place. We preserve the
original values for binary compatibility. New IDs should be added inside
the enum.

Signed-off-by: default avatarEli Cohen <eli@mellanox.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 99c86466

include/uapi/linux/pkt_cls.h

+40 −3
Original line number Diff line number Diff line
@@ -63,10 +63,47 @@ enum { 
#define TC_ACT_GOTO_CHAIN __TC_ACT_EXT(2)

#define TC_ACT_EXT_OPCODE_MAX	TC_ACT_GOTO_CHAIN



/* These macros are put here for binary compatibility with userspace apps that

 * make use of them. For kernel code and new userspace apps, use the TCA_ID_*

 * versions.

 */

#define TCA_ACT_GACT 5

#define TCA_ACT_IPT 6

#define TCA_ACT_PEDIT 7

#define TCA_ACT_MIRRED 8

#define TCA_ACT_NAT 9

#define TCA_ACT_XT 10

#define TCA_ACT_SKBEDIT 11

#define TCA_ACT_VLAN 12

#define TCA_ACT_BPF 13

#define TCA_ACT_CONNMARK 14

#define TCA_ACT_SKBMOD 15

#define TCA_ACT_CSUM 16

#define TCA_ACT_TUNNEL_KEY 17

#define TCA_ACT_SIMP 22

#define TCA_ACT_IFE 25

#define TCA_ACT_SAMPLE 26



/* Action type identifiers*/

enum {

	TCA_ID_UNSPEC = 0,

	TCA_ID_POLICE = 1,

	TCA_ID_GACT = TCA_ACT_GACT,

	TCA_ID_IPT = TCA_ACT_IPT,

	TCA_ID_PEDIT = TCA_ACT_PEDIT,

	TCA_ID_MIRRED = TCA_ACT_MIRRED,

	TCA_ID_NAT = TCA_ACT_NAT,

	TCA_ID_XT = TCA_ACT_XT,

	TCA_ID_SKBEDIT = TCA_ACT_SKBEDIT,

	TCA_ID_VLAN = TCA_ACT_VLAN,

	TCA_ID_BPF = TCA_ACT_BPF,

	TCA_ID_CONNMARK = TCA_ACT_CONNMARK,

	TCA_ID_SKBMOD = TCA_ACT_SKBMOD,

	TCA_ID_CSUM = TCA_ACT_CSUM,

	TCA_ID_TUNNEL_KEY = TCA_ACT_TUNNEL_KEY,

	TCA_ID_SIMP = TCA_ACT_SIMP,

	TCA_ID_IFE = TCA_ACT_IFE,

	TCA_ID_SAMPLE = TCA_ACT_SAMPLE,

	/* other actions go here */

	__TCA_ID_MAX = 255

};

include/uapi/linux/tc_act/tc_bpf.h

+0 −2
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@ 


#include <linux/pkt_cls.h>



#define TCA_ACT_BPF 13



struct tc_act_bpf {

	tc_gen;

};

include/uapi/linux/tc_act/tc_connmark.h

+0 −2
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ 
#include <linux/types.h>

#include <linux/pkt_cls.h>



#define TCA_ACT_CONNMARK 14



struct tc_connmark {

	tc_gen;

	__u16 zone;

include/uapi/linux/tc_act/tc_csum.h

+0 −2
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ 
#include <linux/types.h>

#include <linux/pkt_cls.h>



#define TCA_ACT_CSUM 16



enum {

	TCA_CSUM_UNSPEC,

	TCA_CSUM_PARMS,

include/uapi/linux/tc_act/tc_gact.h

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
#include <linux/types.h>

#include <linux/pkt_cls.h>



#define TCA_ACT_GACT 5

struct tc_gact {

	tc_gen;