cls_flow: add vlan-tag support

commit 94e9cba778cb97d77d9146dc3bd38ff195bc2c8a
Author: Patrick McHardy <kaber@trash.net>
Date:   Sat Feb 2 18:22:16 2008 +0100

    [IPROUTE]: cls_flow: add vlan-tag support

    Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>

diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h
index 16869c2fa5aa835920682823ef067633ffc9f932..e3e9e258ee961b237549b0d6d7a4501084d73405 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,
 };
 

diff --git a/tc/f_flow.c b/tc/f_flow.c
index eca05cd0e3751d61e07ea332f07020c0d2e385f0..1537ade826e11ad3e940082462d843e69f96202a 100644 (file)
--- a/tc/f_flow.c
+++ b/tc/f_flow.c
@@ -32,7 +32,8 @@ static void explain(void)
 "KEY-LIST := [ KEY-LIST , ] KEY\n"
 "KEY      := [ src | dst | proto | proto-src | proto-dst | iif | priority | \n"
 "              mark | nfct | nfct-src | nfct-dst | nfct-proto-src | \n"
-"              nfct-proto-dst | rt-classid | sk-uid | sk-gid ]\n"
+"              nfct-proto-dst | rt-classid | sk-uid | sk-gid |\n"
+"              vlan-tag ]\n"
 "OPS      := [ or NUM | and NUM | xor NUM | rshift NUM | addend NUM ]\n"
 "ID       := X:Y\n"
        );
@@ -55,6 +56,7 @@ static const char *flow_keys[FLOW_KEY_MAX+1] = {
        [FLOW_KEY_RTCLASSID]            = "rt-classid",
        [FLOW_KEY_SKUID]                = "sk-uid",
        [FLOW_KEY_SKGID]                = "sk-gid",
+       [FLOW_KEY_VLAN_TAG]             = "vlan-tag",
 };
 
 static int flow_parse_keys(__u32 *keys, __u32 *nkeys, char *argv)