git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nf/dccp: merge errorpaths
[safe/jmp/linux-2.6]
/
include
/
linux
/
pkt_cls.h
diff --git
a/include/linux/pkt_cls.h
b/include/linux/pkt_cls.h
index
1c1dba9
..
e6aa848
100644
(file)
--- a/
include/linux/pkt_cls.h
+++ b/
include/linux/pkt_cls.h
@@
-201,8
+201,8
@@
enum
struct tc_u32_key
{
struct tc_u32_key
{
- __
u32
mask;
- __
u32
val;
+ __
be32
mask;
+ __
be32
val;
int off;
int offmask;
};
int off;
int offmask;
};
@@
-213,12
+213,12
@@
struct tc_u32_sel
unsigned char offshift;
unsigned char nkeys;
unsigned char offshift;
unsigned char nkeys;
- __
u16
offmask;
+ __
be16
offmask;
__u16 off;
short offoff;
short hoff;
__u16 off;
short offoff;
short hoff;
- __
u32
hmask;
+ __
be32
hmask;
struct tc_u32_key keys[0];
};
struct tc_u32_key keys[0];
};
@@
-348,6
+348,7
@@
enum
FLOW_KEY_RTCLASSID,
FLOW_KEY_SKUID,
FLOW_KEY_SKGID,
FLOW_KEY_RTCLASSID,
FLOW_KEY_SKUID,
FLOW_KEY_SKGID,
+ FLOW_KEY_VLAN_TAG,
__FLOW_KEY_MAX,
};
__FLOW_KEY_MAX,
};
@@
-373,6
+374,7
@@
enum
TCA_FLOW_ACT,
TCA_FLOW_POLICE,
TCA_FLOW_EMATCHES,
TCA_FLOW_ACT,
TCA_FLOW_POLICE,
TCA_FLOW_EMATCHES,
+ TCA_FLOW_PERTURB,
__TCA_FLOW_MAX
};
__TCA_FLOW_MAX
};
@@
-392,6
+394,20
@@
enum
#define TCA_BASIC_MAX (__TCA_BASIC_MAX - 1)
#define TCA_BASIC_MAX (__TCA_BASIC_MAX - 1)
+
+/* Cgroup classifier */
+
+enum
+{
+ TCA_CGROUP_UNSPEC,
+ TCA_CGROUP_ACT,
+ TCA_CGROUP_POLICE,
+ TCA_CGROUP_EMATCHES,
+ __TCA_CGROUP_MAX,
+};
+
+#define TCA_CGROUP_MAX (__TCA_CGROUP_MAX - 1)
+
/* Extended Matches */
struct tcf_ematch_tree_hdr
/* Extended Matches */
struct tcf_ematch_tree_hdr
@@
-459,7
+475,8
@@
enum
#define TCF_EM_U32 3
#define TCF_EM_META 4
#define TCF_EM_TEXT 5
#define TCF_EM_U32 3
#define TCF_EM_META 4
#define TCF_EM_TEXT 5
-#define TCF_EM_MAX 5
+#define TCF_EM_VLAN 6
+#define TCF_EM_MAX 6
enum
{
enum
{