git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
[pandora-kernel.git]
/
include
/
linux
/
pkt_cls.h
diff --git
a/include/linux/pkt_cls.h
b/include/linux/pkt_cls.h
index
1c1dba9
..
28dfc61
100644
(file)
--- a/
include/linux/pkt_cls.h
+++ b/
include/linux/pkt_cls.h
@@
-348,6
+348,7
@@
enum
FLOW_KEY_RTCLASSID,
FLOW_KEY_SKUID,
FLOW_KEY_SKGID,
+ FLOW_KEY_VLAN_TAG,
__FLOW_KEY_MAX,
};
@@
-459,7
+460,8
@@
enum
#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
{